Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 5 Mar 2019 13:26:28 +0000 (14:26 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 5 Mar 2019 13:26:28 +0000 (14:26 +0100)

Trivial merge