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

[Campbell Barton]

Commit: a4e4dc1b752145229e08c2a314c9d911861e8968
Author: Campbell Barton
Date:   Thu Sep 13 15:39:21 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBa4e4dc1b752145229e08c2a314c9d911861e8968

Merge branch 'master' into blender2.8

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



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