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

[Campbell Barton]

Commit: 64e0ab6a00c46faa424f689fd029fa42d418e287
Author: Campbell Barton
Date:   Thu Jun 7 16:32:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB64e0ab6a00c46faa424f689fd029fa42d418e287

Merge branch 'master' into blender2.8

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



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