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

[Campbell Barton]

Commit: 1c4b04f1fde15a3be86a650b54f6e23030a97973
Author: Campbell Barton
Date:   Wed Jun 6 19:52:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1c4b04f1fde15a3be86a650b54f6e23030a97973

Merge branch 'master' into blender2.8

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



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