Merge remote-tracking branch 'openstreetmap/pull/1507'
authorTom Hughes <tom@compton.nu>
Thu, 30 Mar 2017 14:18:14 +0000 (15:18 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 Mar 2017 14:18:14 +0000 (15:18 +0100)

Trivial merge