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

[Campbell Barton]

Commit: e04ea9d3c31a63af28d2ea8ef418ad0b8db16bf7
Author: Campbell Barton
Date:   Tue May 8 13:33:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe04ea9d3c31a63af28d2ea8ef418ad0b8db16bf7

Merge branch 'master' into blender2.8

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



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