Merge remote-tracking branch 'openstreetmap/pull/1510'
authorTom Hughes <tom@compton.nu>
Sat, 8 Apr 2017 15:36:48 +0000 (16:36 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 8 Apr 2017 15:36:48 +0000 (16:36 +0100)

Trivial merge