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

[Campbell Barton]

Commit: 8ceff4c9eea66b9f26e2f1191763e7f3d3a9136f
Author: Campbell Barton
Date:   Wed Sep 5 15:01:58 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB8ceff4c9eea66b9f26e2f1191763e7f3d3a9136f

Merge branch 'master' into blender2.8

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



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