Merge remote-tracking branch 'openstreetmap/pull/1538'
authorTom Hughes <tom@compton.nu>
Wed, 10 May 2017 16:01:06 +0000 (17:01 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 10 May 2017 16:01:06 +0000 (17:01 +0100)

Trivial merge