Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 20 Mar 2019 16:33:54 +0000 (17:33 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 20 Mar 2019 16:33:54 +0000 (17:33 +0100)

Trivial merge