Merge branch 'master' into streamify
authorNiki Roo <niki@nikiroo.be>
Sat, 27 Apr 2019 16:57:26 +0000 (18:57 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 27 Apr 2019 16:57:26 +0000 (18:57 +0200)

Trivial merge