Merge remote-tracking branch 'openstreetmap/pull/1240'
authorTom Hughes <tom@compton.nu>
Thu, 23 Jun 2016 07:59:58 +0000 (08:59 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 23 Jun 2016 07:59:58 +0000 (08:59 +0100)

Trivial merge