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

[Campbell Barton]

Commit: c085d9b1bee0ece984ae45cab85d75fe17a299c3
Author: Campbell Barton
Date:   Mon Aug 6 17:13:27 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBc085d9b1bee0ece984ae45cab85d75fe17a299c3

Merge branch 'master' into blender2.8

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



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