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

[Antony Riakiotakis]

Commit: bffcad6a8107de31ee7ba0827d7d60a3851e5288
Author: Antony Riakiotakis
Date:   Wed Jul 1 16:25:49 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBbffcad6a8107de31ee7ba0827d7d60a3851e5288

Merge branch 'master' into gooseberry

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



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