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

[Antony Riakiotakis]

Commit: 06058c5feb7f9a967e293505bfe126b15002f3ef
Author: Antony Riakiotakis
Date:   Fri Jun 5 15:28:29 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB06058c5feb7f9a967e293505bfe126b15002f3ef

Merge branch 'master' into gooseberry

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



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