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

[Campbell Barton]

Commit: e6540ec175cf3689adf0425afdb7847c68f23c2e
Author: Campbell Barton
Date:   Wed Sep 12 16:28:50 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe6540ec175cf3689adf0425afdb7847c68f23c2e

Merge branch 'master' into blender2.8

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



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