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

[Campbell Barton]

Commit: 6739bb195ea332cb067311c9162a9439204b9485
Author: Campbell Barton
Date:   Fri Jun 8 15:22:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6739bb195ea332cb067311c9162a9439204b9485

Merge branch 'master' into blender2.8

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



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