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

[Antony Riakiotakis]

Commit: fe0025f2abd70ea8afa1b17307351df000fb86c5
Author: Antony Riakiotakis
Date:   Tue May 19 18:34:43 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBfe0025f2abd70ea8afa1b17307351df000fb86c5

Merge branch 'master' into gooseberry

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



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