[Bf-extensions-cvs] [39ace717] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 39ace717e5ad8ce11f9b1e064ff820e145716368
Author: Campbell Barton
Date:   Wed Jun 27 17:24:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBA39ace717e5ad8ce11f9b1e064ff820e145716368

Merge branch 'master' into blender2.8

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



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