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

[Campbell Barton]

Commit: a0453dadf0685782ffb8ac6b3c6470a3d44c8a01
Author: Campbell Barton
Date:   Mon Oct 29 13:04:47 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBa0453dadf0685782ffb8ac6b3c6470a3d44c8a01

Merge branch 'master' into blender2.8

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



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