Merge branch 'master' into search
authorNiki Roo <niki@nikiroo.be>
Fri, 12 Apr 2019 07:28:10 +0000 (09:28 +0200)
committerNiki Roo <niki@nikiroo.be>
Fri, 12 Apr 2019 07:28:10 +0000 (09:28 +0200)

Trivial merge