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

[Campbell Barton]

Commit: bdf215ca8246b1fe6691226b09fc855a09d40f21
Author: Campbell Barton
Date:   Tue Sep 11 15:01:41 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBbdf215ca8246b1fe6691226b09fc855a09d40f21

Merge branch 'master' into blender2.8

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



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