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

[Campbell Barton]

Commit: 3a2a10e3a69e8d4e3b9960c257860b66e755579e
Author: Campbell Barton
Date:   Fri Jun 15 10:25:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3a2a10e3a69e8d4e3b9960c257860b66e755579e

Merge branch 'master' into blender2.8

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



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