Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 3 Oct 2018 10:12:22 +0000 (12:12 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 3 Oct 2018 10:12:22 +0000 (12:12 +0200)

Trivial merge