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

[Campbell Barton]

Commit: 52cb62d502b3ad7bb3ad744c5e19ed152179c1a8
Author: Campbell Barton
Date:   Tue May 15 09:08:48 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB52cb62d502b3ad7bb3ad744c5e19ed152179c1a8

Merge branch 'master' into blender2.8

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



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