From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Jun 2019 20:10:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2226'
X-Git-Tag: live~2708
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/31edc7dff6f4305366d0f93d35ba3fb1956bb71f?ds=sidebyside;hp=31edc7dff6f4305366d0f93d35ba3fb1956bb71f

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