From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 27 Nov 2018 21:38:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~304
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/817e5ba51eb8b8a4fbb5a430139b974a67f601cf?hp=--cc

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

817e5ba51eb8b8a4fbb5a430139b974a67f601cf