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

[Campbell Barton]

Commit: 43bceeedd9444ef450133751e32fa76c5d11ecac
Author: Campbell Barton
Date:   Sun Apr 22 19:23:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB43bceeedd9444ef450133751e32fa76c5d11ecac

Merge branch 'master' into blender2.8

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



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