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

[Campbell Barton]

Commit: 08da2826e0f29a6a43b60deb3b31dac8dba22e6d
Author: Campbell Barton
Date:   Fri May 25 10:52:53 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB08da2826e0f29a6a43b60deb3b31dac8dba22e6d

Merge branch 'master' into blender2.8

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



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