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

[Campbell Barton]

Commit: a3f520170c9b43b195da085d20ca09866d8b2554
Author: Campbell Barton
Date:   Thu Jun 7 14:58:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3f520170c9b43b195da085d20ca09866d8b2554

Merge branch 'master' into blender2.8

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



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