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

[Campbell Barton]

Commit: 4b8d7a143e491611581dc1e749e34eaec67e4377
Author: Campbell Barton
Date:   Wed Apr 25 14:54:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4b8d7a143e491611581dc1e749e34eaec67e4377

Merge branch 'master' into blender2.8

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



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