Merge branch 'blender2.8' of git.blender.org:blender into blender2.8
authorJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 08:42:03 +0000 (10:42 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Thu, 19 Apr 2018 08:42:03 +0000 (10:42 +0200)

Trivial merge