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

[Campbell Barton]

Commit: 8ce8a4edb3eaeeac60cc1c2d577c8d9455dfa9af
Author: Campbell Barton
Date:   Thu Nov 27 19:12:40 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB8ce8a4edb3eaeeac60cc1c2d577c8d9455dfa9af

Merge branch 'master' into gooseberry

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



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