[Bf-blender-cvs] [cc588eb] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: cc588eb1e4091f77c35dd88557ed7f2e2ac73bf2
Author: Antony Riakiotakis
Date:   Fri May 8 12:36:20 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBcc588eb1e4091f77c35dd88557ed7f2e2ac73bf2

Merge branch 'master' into gooseberry

===================================================================



===================================================================