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

[Campbell Barton]

Commit: cb8afaf5db9de16965dbb693cbd43cf767d5e7ed
Author: Campbell Barton
Date:   Fri Nov 30 17:07:59 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBcb8afaf5db9de16965dbb693cbd43cf767d5e7ed

Merge branch 'master' into blender2.8

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



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