From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 5 Aug 2018 13:48:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~315
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/ec8963f3d2e18a197aee8576889400fb058150d3

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

ec8963f3d2e18a197aee8576889400fb058150d3