From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 3 Jul 2018 19:15:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~324
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/13291274e73e1d2fc3582e49fd635f92a9b061e1

Merge remote-tracking branch 'upstream/master'
---

13291274e73e1d2fc3582e49fd635f92a9b061e1