Merge remote-tracking branch 'openstreetmap/pull/1043'
authorTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:18:05 +0000 (21:18 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:18:05 +0000 (21:18 +0100)

Trivial merge