Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 27 Jun 2018 22:13:52 +0000 (00:13 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 27 Jun 2018 22:13:52 +0000 (00:13 +0200)

Trivial merge