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

[Campbell Barton]

Commit: bca7563d072f111807fd384d5cf0fcf9d91eccb1
Author: Campbell Barton
Date:   Thu Apr 19 18:11:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBbca7563d072f111807fd384d5cf0fcf9d91eccb1

Merge branch 'master' into blender2.8

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



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