[Bf-blender-cvs] [3cb19a3d895] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 3cb19a3d895bfe6c7bd6d5068bdc00cd94e4fb13
Author: Campbell Barton
Date:   Wed Nov 29 18:06:24 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB3cb19a3d895bfe6c7bd6d5068bdc00cd94e4fb13

Merge branch 'master' into blender2.8

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



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