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

[Campbell Barton]

Commit: 9768480a7b6f083e4a1655543cf99b665e2e353f
Author: Campbell Barton
Date:   Thu Nov 27 21:40:41 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB9768480a7b6f083e4a1655543cf99b665e2e353f

Merge branch 'master' into gooseberry

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



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