backport (small) changes from master
authorNiki Roo <niki@nikiroo.be>
Sat, 25 May 2019 17:25:35 +0000 (19:25 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 25 May 2019 17:25:35 +0000 (19:25 +0200)

No differences found