From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Oct 2016 12:48:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1312'
X-Git-Tag: live~3769
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3123822bba5865e81e8c10be16452a0a8b5362f9

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

3123822bba5865e81e8c10be16452a0a8b5362f9