From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 1 Jun 2017 19:51:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~381
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/695a1712571bdb8829616cb7e8385d99825cc206

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

695a1712571bdb8829616cb7e8385d99825cc206