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

[Campbell Barton]

Commit: 0b443c8a232b021bff9f5bd17d66c71aa7694df7
Author: Campbell Barton
Date:   Fri Nov 28 22:21:00 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB0b443c8a232b021bff9f5bd17d66c71aa7694df7

Merge branch 'master' into gooseberry

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



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