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

[Campbell Barton]

Commit: d638ad3b20577101cffedca069222b219e71b14f
Author: Campbell Barton
Date:   Thu May 24 16:44:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd638ad3b20577101cffedca069222b219e71b14f

Merge branch 'master' into blender2.8

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



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