merge master
authorNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 17:33:34 +0000 (19:33 +0200)
committerNiki Roo <niki@nikiroo.be>
Sun, 28 Apr 2019 17:33:34 +0000 (19:33 +0200)

Trivial merge