Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 7 Feb 2019 14:49:41 +0000 (15:49 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 7 Feb 2019 14:49:41 +0000 (15:49 +0100)

Trivial merge