[Bf-blender-cvs] [3d681108bf8] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 3d681108bf83970b06cc48a8752a2af14d6a2b71
Author: Campbell Barton
Date:   Fri Jun 8 08:50:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3d681108bf83970b06cc48a8752a2af14d6a2b71

Merge branch 'master' into blender2.8

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



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