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

[Campbell Barton]

Commit: 6855d537e3112f7ba4d84524d06a524b0ea9f7b1
Author: Campbell Barton
Date:   Sun Jun 17 15:52:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6855d537e3112f7ba4d84524d06a524b0ea9f7b1

Merge branch 'master' into blender2.8

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



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