From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 25 Oct 2017 20:47:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~355
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c3940466b817a4c10a956f61c43d6bee3214dd40

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

c3940466b817a4c10a956f61c43d6bee3214dd40