From: Tom Hughes <tom@compton.nu>
Date: Wed, 23 Jan 2019 19:05:14 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2122'
X-Git-Tag: live~2688
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2f28495d6b041c99536fe494c447c4e93fa79d16

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

2f28495d6b041c99536fe494c447c4e93fa79d16