From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 May 2019 17:06:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2225'
X-Git-Tag: live~2593
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f99c383318c4f9ea15639f0566f3e42db4e2c8b1?hp=f99c383318c4f9ea15639f0566f3e42db4e2c8b1

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