Merge remote-tracking branch 'openstreetmap/pull/1553'
authorTom Hughes <tom@compton.nu>
Fri, 2 Jun 2017 19:34:17 +0000 (20:34 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 2 Jun 2017 19:34:17 +0000 (20:34 +0100)

Trivial merge