Merge commit '9e7330d793887fe9ee378ca1413141d7761e76ca'
authorNiki Roo <niki@nikiroo.be>
Tue, 19 May 2020 19:22:46 +0000 (21:22 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 19 May 2020 19:22:46 +0000 (21:22 +0200)

Trivial merge