Merge remote-tracking branch 'openstreetmap/pull/1348'
authorTom Hughes <tom@compton.nu>
Sat, 29 Oct 2016 15:26:16 +0000 (16:26 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 29 Oct 2016 15:26:16 +0000 (16:26 +0100)

Trivial merge