Merge commit '9bd801bfc6a10e5298cdec6e48ca0506ecdfde53'
authorNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 13:34:44 +0000 (15:34 +0200)
committerNiki Roo <niki@nikiroo.be>
Thu, 14 May 2020 13:34:44 +0000 (15:34 +0200)

Trivial merge