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

[Campbell Barton]

Commit: 9a301978bdf0a7bab8dedf62e8c623aa33e96177
Author: Campbell Barton
Date:   Thu Apr 19 08:18:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9a301978bdf0a7bab8dedf62e8c623aa33e96177

Merge branch 'master' into blender2.8

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



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