From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 20 Jul 2018 21:30:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~311
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/a9ef3021320949e46b098b20d467adc82b96bfb9

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

a9ef3021320949e46b098b20d467adc82b96bfb9