Merge branch 'master' into streamify
authorNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 09:31:32 +0000 (11:31 +0200)
committerNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 09:31:32 +0000 (11:31 +0200)

Trivial merge