Merge branch 'blender-v2.82-release'
authorPhilipp Oeser <info@graphics-engineer.com>
Wed, 29 Jan 2020 19:38:12 +0000 (20:38 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Wed, 29 Jan 2020 19:38:12 +0000 (20:38 +0100)

Trivial merge