From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 17 Dec 2017 22:51:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~343
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/2110207074f4b67b1cea1b4c322201664395a843

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

2110207074f4b67b1cea1b4c322201664395a843