Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 06:48:40 +0000 (08:48 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Thu, 24 May 2018 06:48:40 +0000 (08:48 +0200)

Trivial merge