Merge remote-tracking branch 'openstreetmap/pull/1338'
authorTom Hughes <tom@compton.nu>
Wed, 26 Oct 2016 14:48:56 +0000 (15:48 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Oct 2016 14:48:56 +0000 (15:48 +0100)

Trivial merge