Merge branch 'master' into streamify
authorNiki Roo <niki@nikiroo.be>
Thu, 25 Apr 2019 16:41:17 +0000 (18:41 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 25 Apr 2019 16:41:17 +0000 (18:41 +0200)

Trivial merge