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

[Campbell Barton]

Commit: 42126bdf0614c7ba58987b912f60d4a14a58a076
Author: Campbell Barton
Date:   Tue Dec 11 14:05:16 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB42126bdf0614c7ba58987b912f60d4a14a58a076

Merge branch 'master' into blender2.8

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



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