Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 1 May 2018 14:28:02 +0000 (16:28 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 1 May 2018 14:28:02 +0000 (16:28 +0200)

Trivial merge