Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 08:28:36 +0000 (10:28 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 08:28:36 +0000 (10:28 +0200)

Trivial merge