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

Trivial merge