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

Trivial merge