Merge remote-tracking branch 'openstreetmap/pull/1451'
authorTom Hughes <tom@compton.nu>
Mon, 20 Feb 2017 09:05:35 +0000 (09:05 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 20 Feb 2017 09:05:35 +0000 (09:05 +0000)

Trivial merge