From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Jul 2018 16:38:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1939'
X-Git-Tag: live~2893
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e418074b2ae7598a5b84c5b2fbabe57960ab0d00

Merge remote-tracking branch 'upstream/pull/1939'
---

e418074b2ae7598a5b84c5b2fbabe57960ab0d00