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

[Campbell Barton]

Commit: a5a0dcec902d6bbff0fe0fc1bb7fb21045823166
Author: Campbell Barton
Date:   Tue Mar 6 19:13:41 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa5a0dcec902d6bbff0fe0fc1bb7fb21045823166

Merge branch 'master' into blender2.8

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



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