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

[Campbell Barton]

Commit: 7ce81484f8214cd52b000e8d3f47dd3aed56da84
Author: Campbell Barton
Date:   Sat Jun 9 12:06:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7ce81484f8214cd52b000e8d3f47dd3aed56da84

Merge branch 'master' into blender2.8

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



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