Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 29 Nov 2018 15:49:21 +0000 (16:49 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 29 Nov 2018 15:49:21 +0000 (16:49 +0100)

Trivial merge