Merge commit '738dd8c426dcc6ed2508d68b7985f68d66549889'
authorNiki Roo <niki@nikiroo.be>
Thu, 24 Oct 2019 17:46:32 +0000 (19:46 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 24 Oct 2019 17:46:32 +0000 (19:46 +0200)

Trivial merge