Merge remote-tracking branch 'openstreetmap/pull/1483'
authorTom Hughes <tom@compton.nu>
Thu, 9 Mar 2017 18:35:57 +0000 (18:35 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 9 Mar 2017 18:35:57 +0000 (18:35 +0000)

Trivial merge