Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Wed, 2 May 2018 15:37:37 +0000 (17:37 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Wed, 2 May 2018 15:37:37 +0000 (17:37 +0200)

Trivial merge