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

[Campbell Barton]

Commit: c1730a03af3c929d256ddda04cc2657fc9a03dc0
Author: Campbell Barton
Date:   Mon Apr 16 07:39:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc1730a03af3c929d256ddda04cc2657fc9a03dc0

Merge branch 'master' into blender2.8

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



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