Merge remote-tracking branch 'openstreetmap/pull/1036'
authorTom Hughes <tom@compton.nu>
Fri, 19 Aug 2016 11:26:51 +0000 (12:26 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 19 Aug 2016 11:26:51 +0000 (12:26 +0100)

Trivial merge