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

[Campbell Barton]

Commit: 419a813938f7dc39a96145aefae680413c93dfe8
Author: Campbell Barton
Date:   Sat Jun 9 18:48:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB419a813938f7dc39a96145aefae680413c93dfe8

Merge branch 'master' into blender2.8

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



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