From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Jan 2017 17:51:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1416'
X-Git-Tag: live~4845
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e1cac818b128f71482a495b51ee30b7812a53dc2

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

e1cac818b128f71482a495b51ee30b7812a53dc2