[Bf-blender-cvs] [43ce201125f] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 43ce201125ff97e16a56b372a91442590498dacc
Author: Campbell Barton
Date:   Sun Jun 17 11:57:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43ce201125ff97e16a56b372a91442590498dacc

Merge branch 'master' into blender2.8

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



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