Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 14:47:25 +0000 (16:47 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 18 Apr 2017 14:47:25 +0000 (16:47 +0200)

Trivial merge