Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 21 Apr 2019 01:08:58 +0000 (03:08 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 21 Apr 2019 01:08:58 +0000 (03:08 +0200)

Trivial merge