Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 May 2017 00:48:14 +0000 (02:48 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 25 May 2017 00:48:14 +0000 (02:48 +0200)

Trivial merge