From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Dec 2015 14:21:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1082'
X-Git-Tag: live~3959
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bb9f20710e851eb4943bfb8e63386680e359834a

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

bb9f20710e851eb4943bfb8e63386680e359834a