Merge remote-tracking branch 'openstreetmap/pull/1436'
authorTom Hughes <tom@compton.nu>
Thu, 23 Feb 2017 10:06:42 +0000 (10:06 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 23 Feb 2017 10:06:42 +0000 (10:06 +0000)

Trivial merge