Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 14 Jan 2019 11:13:10 +0000 (12:13 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 14 Jan 2019 11:13:10 +0000 (12:13 +0100)

Trivial merge