Merge remote-tracking branch 'openstreetmap/pull/1458'
authorTom Hughes <tom@compton.nu>
Wed, 22 Feb 2017 17:55:37 +0000 (17:55 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 22 Feb 2017 17:55:37 +0000 (17:55 +0000)

Trivial merge