Merge branch 'master' into search
authorNiki Roo <niki@nikiroo.be>
Sat, 13 Apr 2019 06:40:43 +0000 (08:40 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 13 Apr 2019 06:40:43 +0000 (08:40 +0200)

Trivial merge