Merge remote-tracking branch 'openstreetmap/pull/1495'
authorTom Hughes <tom@compton.nu>
Wed, 22 Mar 2017 19:11:04 +0000 (19:11 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 22 Mar 2017 19:11:04 +0000 (19:11 +0000)

Trivial merge