Merge branch 'master' into streamify
authorNiki Roo <niki@nikiroo.be>
Wed, 24 Apr 2019 19:42:42 +0000 (21:42 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 24 Apr 2019 19:42:42 +0000 (21:42 +0200)

Trivial merge