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

[Campbell Barton]

Commit: 01136931292e6084a8571f24145c5d9738bf9ff6
Author: Campbell Barton
Date:   Wed Apr 25 17:27:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB01136931292e6084a8571f24145c5d9738bf9ff6

Merge branch 'master' into blender2.8

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



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