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

[Campbell Barton]

Commit: 49baf15a35e89dc9ef945d584a0842d908bd040a
Author: Campbell Barton
Date:   Wed Mar 7 14:31:53 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB49baf15a35e89dc9ef945d584a0842d908bd040a

Merge branch 'master' into blender2.8

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



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