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

[Campbell Barton]

Commit: 194cba8ba4aa829c135f891f18679d9a0889a8b9
Author: Campbell Barton
Date:   Fri May 11 20:13:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB194cba8ba4aa829c135f891f18679d9a0889a8b9

Merge branch 'master' into blender2.8

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



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