Merge remote-tracking branch 'openstreetmap/pull/1443'
authorTom Hughes <tom@compton.nu>
Sat, 18 Feb 2017 16:08:04 +0000 (16:08 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 18 Feb 2017 16:08:04 +0000 (16:08 +0000)

Trivial merge