Merge remote-tracking branch 'openstreetmap/pull/1492'
authorTom Hughes <tom@compton.nu>
Thu, 16 Mar 2017 19:02:35 +0000 (19:02 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 16 Mar 2017 19:02:35 +0000 (19:02 +0000)

Trivial merge