Merge branch 'master' into search
authorNiki Roo <niki@nikiroo.be>
Sat, 13 Apr 2019 11:33:46 +0000 (13:33 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 13 Apr 2019 11:33:46 +0000 (13:33 +0200)

Trivial merge