From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 21 May 2018 10:01:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~321
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/1d8e2961f0527a548989c1e38bb062f2f9e5877e

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

1d8e2961f0527a548989c1e38bb062f2f9e5877e