Merge branch 'blender-v2.82-release'
authorPhilipp Oeser <info@graphics-engineer.com>
Fri, 31 Jan 2020 20:58:02 +0000 (21:58 +0100)
committerPhilipp Oeser <info@graphics-engineer.com>
Fri, 31 Jan 2020 20:58:02 +0000 (21:58 +0100)

Trivial merge