Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 16:05:56 +0000 (17:05 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 16:05:56 +0000 (17:05 +0100)

Trivial merge