Merge commit '53c2b6a134b08402e1daf3e4c84b9b888de9cc9c'
authorNiki Roo <niki@nikiroo.be>
Wed, 20 May 2020 14:41:05 +0000 (16:41 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 20 May 2020 14:41:05 +0000 (16:41 +0200)

Trivial merge