Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 23 Jan 2019 11:09:08 +0000 (12:09 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 23 Jan 2019 11:09:08 +0000 (12:09 +0100)

Trivial merge