Merge remote-tracking branch 'openstreetmap/pull/1332'
authorTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 11:22:42 +0000 (12:22 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 11:22:42 +0000 (12:22 +0100)

Trivial merge