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

[Campbell Barton]

Commit: 26644cd424cb215eb9ae77d77d25e2a6a85ad33e
Author: Campbell Barton
Date:   Thu Apr 26 14:36:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB26644cd424cb215eb9ae77d77d25e2a6a85ad33e

Merge branch 'master' into blender2.8

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



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