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

[Julian Eisel]

Commit: 1bccbbc04c71ef58bb0f75dde4bb91ebc1bfc512
Author: Julian Eisel
Date:   Mon Apr 13 20:36:07 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB1bccbbc04c71ef58bb0f75dde4bb91ebc1bfc512

Merge branch 'master' into gooseberry

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



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