Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 19 Feb 2019 18:00:46 +0000 (19:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 19 Feb 2019 18:00:46 +0000 (19:00 +0100)

Trivial merge