Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Jul 2017 21:45:36 +0000 (23:45 +0200)

Trivial merge