Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 2 Jan 2019 18:58:26 +0000 (19:58 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 2 Jan 2019 18:58:26 +0000 (19:58 +0100)

Trivial merge