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

[Campbell Barton]

Commit: b2fa20f6c9dbbfa69027a543d143a6ed6371e821
Author: Campbell Barton
Date:   Mon Jun 18 18:12:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb2fa20f6c9dbbfa69027a543d143a6ed6371e821

Merge branch 'master' into blender2.8

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



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