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

[Antony Riakiotakis]

Commit: b2ca6a2d8e0e05448576bab7d45e1126e8c6986c
Author: Antony Riakiotakis
Date:   Wed Jan 28 15:34:37 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBb2ca6a2d8e0e05448576bab7d45e1126e8c6986c

Merge branch 'master' into gooseberry

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



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