Merge remote-tracking branch 'openstreetmap/pull/1154'
authorTom Hughes <tom@compton.nu>
Mon, 15 Feb 2016 21:09:59 +0000 (21:09 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 15 Feb 2016 21:09:59 +0000 (21:09 +0000)

Trivial merge