From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 2 Oct 2017 21:10:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~369
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b610118a88489c11249e9c0d30b252d3d98bd287

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

b610118a88489c11249e9c0d30b252d3d98bd287