Merge branch 'blender-v2.82-release'
authorCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jan 2020 05:52:36 +0000 (16:52 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 30 Jan 2020 05:52:36 +0000 (16:52 +1100)

Trivial merge