Merge remote-tracking branch 'openstreetmap/pull/1270'
authorTom Hughes <tom@compton.nu>
Wed, 17 Aug 2016 07:24:28 +0000 (08:24 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 17 Aug 2016 07:24:28 +0000 (08:24 +0100)

Trivial merge