Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 5 Dec 2018 11:54:45 +0000 (12:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 5 Dec 2018 11:54:45 +0000 (12:54 +0100)

Trivial merge