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

[Campbell Barton]

Commit: 5760c6b25cc4e014868ff67f2c357ea38e40eafa
Author: Campbell Barton
Date:   Thu May 3 20:24:44 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5760c6b25cc4e014868ff67f2c357ea38e40eafa

Merge branch 'master' into blender2.8

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



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