Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 5 Aug 2018 10:15:13 +0000 (12:15 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 5 Aug 2018 10:15:13 +0000 (12:15 +0200)

Trivial merge