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

[Campbell Barton]

Commit: 7ed6de3951271b10b354c7f0ed82891b768b108e
Author: Campbell Barton
Date:   Tue Aug 14 17:12:41 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB7ed6de3951271b10b354c7f0ed82891b768b108e

Merge branch 'master' into blender2.8

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



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