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

Trivial merge