From: Tom Hughes <tom@compton.nu>
Date: Thu, 8 Sep 2016 18:26:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1279'
X-Git-Tag: live~3745
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f02729fa9a29089224502fecc7bf347fa73db0dd

Merge remote-tracking branch 'openstreetmap/pull/1279'
---

f02729fa9a29089224502fecc7bf347fa73db0dd