Merge remote-tracking branch 'openstreetmap/pull/1477'
authorTom Hughes <tom@compton.nu>
Mon, 6 Mar 2017 17:54:26 +0000 (17:54 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 6 Mar 2017 17:54:26 +0000 (17:54 +0000)

Trivial merge