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

[Campbell Barton]

Commit: 606223f6a61fb21606ac6faf10aed963c524a3c7
Author: Campbell Barton
Date:   Fri Dec 7 15:54:17 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB606223f6a61fb21606ac6faf10aed963c524a3c7

Merge branch 'master' into blender2.8

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



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