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

[Campbell Barton]

Commit: 94d0fb03448602474e927e9dcd7e7b6feeaad38b
Author: Campbell Barton
Date:   Tue Nov 4 17:10:33 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB94d0fb03448602474e927e9dcd7e7b6feeaad38b

Merge branch 'master' into gooseberry

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



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