Merge remote-tracking branch 'openstreetmap/pull/1426'
authorTom Hughes <tom@compton.nu>
Mon, 6 Feb 2017 19:10:25 +0000 (19:10 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 6 Feb 2017 19:10:25 +0000 (19:10 +0000)

Trivial merge