From: Tom Hughes <tom@compton.nu>
Date: Sat, 16 Jun 2018 10:45:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1576'
X-Git-Tag: live~2996
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7441f15b4fd59735ae00a16b47cfcf7eb99260a6

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

7441f15b4fd59735ae00a16b47cfcf7eb99260a6