Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 28 Feb 2019 18:17:54 +0000 (19:17 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 28 Feb 2019 18:17:54 +0000 (19:17 +0100)

Trivial merge