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

[Campbell Barton]

Commit: da8d33e2e36ed8a5322921617de1452011e0ec9c
Author: Campbell Barton
Date:   Thu Jun 7 13:41:32 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBda8d33e2e36ed8a5322921617de1452011e0ec9c

Merge branch 'master' into blender2.8

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



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