Merge commit 'ebac96b0184f044a4b2db35cb8f445aeb048d743'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:42:18 +0000 (16:42 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 14:42:18 +0000 (16:42 +0200)

Trivial merge