Merge branch 'blender-v2.82-release'
authorCampbell Barton <ideasman42@gmail.com>
Mon, 3 Feb 2020 06:58:38 +0000 (17:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 3 Feb 2020 06:58:38 +0000 (17:58 +1100)

Trivial merge