Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 24 Sep 2018 16:11:14 +0000 (18:11 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 24 Sep 2018 16:11:14 +0000 (18:11 +0200)

Trivial merge