Merge commit '877a44c78f1c4985aa362f6cdce385a4f860b51d'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:41:40 +0000 (16:41 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:41:40 +0000 (16:41 +0200)

Trivial merge