Merge remote-tracking branch 'openstreetmap/pull/1375'
authorTom Hughes <tom@compton.nu>
Thu, 17 Nov 2016 20:38:16 +0000 (20:38 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 17 Nov 2016 20:38:16 +0000 (20:38 +0000)

Trivial merge