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

[Antony Riakiotakis]

Commit: f89385b17c6d31545f2982c3e18cd267266ca719
Author: Antony Riakiotakis
Date:   Fri May 8 17:17:47 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBf89385b17c6d31545f2982c3e18cd267266ca719

Merge branch 'master' into gooseberry

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



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