Merge commit 'b459e462a5c3447d0693674253c40bc7385a4f66'
authorNiki Roo <niki@nikiroo.be>
Wed, 13 May 2020 12:29:59 +0000 (14:29 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 13 May 2020 12:29:59 +0000 (14:29 +0200)

Trivial merge