[Bf-blender-cvs] [4c5541feefd] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 4c5541feefd40f32c71b7eb51f3562e4fccf146d
Author: Campbell Barton
Date:   Mon Jul 9 07:30:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4c5541feefd40f32c71b7eb51f3562e4fccf146d

Merge branch 'master' into blender2.8

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



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