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

[Campbell Barton]

Commit: 4b544e857c94118ff3957d7fa15758507fd94181
Author: Campbell Barton
Date:   Tue Apr 24 08:01:21 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4b544e857c94118ff3957d7fa15758507fd94181

Merge branch 'master' into blender2.8

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



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