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

[Campbell Barton]

Commit: 0297274720d7c61ea4ccad0b82456d680965b354
Author: Campbell Barton
Date:   Fri Jun 8 10:54:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0297274720d7c61ea4ccad0b82456d680965b354

Merge branch 'master' into blender2.8

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



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