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

[Campbell Barton]

Commit: 38232871791e88eb8294441c013171113cb61012
Author: Campbell Barton
Date:   Thu Jun 7 17:08:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB38232871791e88eb8294441c013171113cb61012

Merge branch 'master' into blender2.8

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



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