Merge remote-tracking branch 'openstreetmap/pull/1457'
authorTom Hughes <tom@compton.nu>
Wed, 22 Feb 2017 12:28:13 +0000 (12:28 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 22 Feb 2017 12:28:13 +0000 (12:28 +0000)

Trivial merge