Merge branch 'blender-v2.82-release'
authorCampbell Barton <ideasman42@gmail.com>
Wed, 29 Jan 2020 02:02:31 +0000 (13:02 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 29 Jan 2020 02:02:31 +0000 (13:02 +1100)

Trivial merge