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

[Campbell Barton]

Commit: cfc4805455bc03f5f810d0d234880727284e93cf
Author: Campbell Barton
Date:   Thu Jun 7 20:41:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcfc4805455bc03f5f810d0d234880727284e93cf

Merge branch 'master' into blender2.8

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



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