Merge branch 'blender2.7' into master.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 14:36:22 +0000 (15:36 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 14:56:15 +0000 (15:56 +0100)

Trivial merge