Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Dec 2018 09:53:02 +0000 (10:53 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 27 Dec 2018 09:53:02 +0000 (10:53 +0100)

Trivial merge