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

[Julian Eisel]

Commit: 715c57f3b06cac679c324b614da42f4e8b452386
Author: Julian Eisel
Date:   Wed Apr 8 16:27:31 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB715c57f3b06cac679c324b614da42f4e8b452386

Merge branch 'master' into gooseberry

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



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