From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 27 May 2017 14:43:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~390
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/496a0f1384594aad954f7abcf124e8da86c4b3a1

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

496a0f1384594aad954f7abcf124e8da86c4b3a1