Merge commit 'edcd53bbbba9f94e21f43fd03d3a2febcc2b1564'
authorNiki Roo <niki@nikiroo.be>
Mon, 30 Dec 2019 16:28:40 +0000 (17:28 +0100)
committerNiki Roo <niki@nikiroo.be>
Mon, 30 Dec 2019 16:28:40 +0000 (17:28 +0100)

Trivial merge