Merge remote-tracking branch 'openstreetmap/pull/1484'
authorTom Hughes <tom@compton.nu>
Fri, 10 Mar 2017 15:58:57 +0000 (15:58 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 10 Mar 2017 15:58:57 +0000 (15:58 +0000)

Trivial merge