Merge remote-tracking branch 'openstreetmap/pull/1488'
authorTom Hughes <tom@compton.nu>
Wed, 15 Mar 2017 14:22:59 +0000 (14:22 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Mar 2017 14:22:59 +0000 (14:22 +0000)

Trivial merge