Merge branch 'master' into tmp
authorNiki Roo <niki@nikiroo.be>
Sun, 10 Mar 2019 16:23:27 +0000 (17:23 +0100)
committerNiki Roo <niki@nikiroo.be>
Sun, 10 Mar 2019 16:23:27 +0000 (17:23 +0100)

Trivial merge