Merge branch 'master' into streamify streamify
authorNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 17:43:14 +0000 (19:43 +0200)
committerNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 17:43:14 +0000 (19:43 +0200)

Trivial merge