[Bf-blender-cvs] [10d7ebc469b] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 10d7ebc469b2fd7287577af68df7d1c4cbd37148
Author: Campbell Barton
Date:   Thu Nov 1 16:20:52 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB10d7ebc469b2fd7287577af68df7d1c4cbd37148

Merge branch 'master' into blender2.8

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



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