From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 16 Nov 2018 23:37:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~299
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/4e478c8af0dff8d7de52ea22e4e0b817135cb28c

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

4e478c8af0dff8d7de52ea22e4e0b817135cb28c