Merge commit '2953f98805434534094068a52bf983b71282cf5c' into wip
authorNiki Roo <niki@nikiroo.be>
Wed, 28 Mar 2018 13:21:37 +0000 (15:21 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 28 Mar 2018 13:21:37 +0000 (15:21 +0200)

Trivial merge