From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jun 2019 18:50:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2257'
X-Git-Tag: live~3121
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d9b8ebeb01e6cf81f6d9ea70748fedb14e4d86fa?ds=sidebyside;hp=-c

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

d9b8ebeb01e6cf81f6d9ea70748fedb14e4d86fa