From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 5 Jul 2018 17:29:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~317
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/203b5f7de12ca09d275103eb2eb70fe5a4c20466?hp=-c

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

203b5f7de12ca09d275103eb2eb70fe5a4c20466