Merge remote-tracking branch 'openstreetmap/pull/1527'
authorTom Hughes <tom@compton.nu>
Mon, 24 Apr 2017 20:05:23 +0000 (21:05 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 24 Apr 2017 20:05:23 +0000 (21:05 +0100)

Trivial merge