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

[Campbell Barton]

Commit: a08a8aa92895fbf12899b2f19508fcd9cb752277
Author: Campbell Barton
Date:   Sat Jun 2 13:09:12 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa08a8aa92895fbf12899b2f19508fcd9cb752277

Merge branch 'master' into blender2.8

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



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