Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 7 Nov 2018 13:54:32 +0000 (14:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 7 Nov 2018 13:54:32 +0000 (14:54 +0100)

Trivial merge