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

[Campbell Barton]

Commit: 155b02a1965745eeb876a338f7d8f23b4ba58c0c
Author: Campbell Barton
Date:   Mon Dec 10 12:45:38 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB155b02a1965745eeb876a338f7d8f23b4ba58c0c

Merge branch 'master' into blender2.8

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



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