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

[Campbell Barton]

Commit: 1de7a0c0dc011a9286f14552858f10efc64d5f91
Author: Campbell Barton
Date:   Sun Apr 22 10:51:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1de7a0c0dc011a9286f14552858f10efc64d5f91

Merge branch 'master' into blender2.8

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



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