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

Trivial merge