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

[Campbell Barton]

Commit: de30c475132a89dc087395a0642f084946f343ef
Author: Campbell Barton
Date:   Thu Jun 28 11:10:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBde30c475132a89dc087395a0642f084946f343ef

Merge branch 'master' into blender2.8

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



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