Merge remote-tracking branch 'openstreetmap/pull/1491'
authorTom Hughes <tom@compton.nu>
Wed, 15 Mar 2017 17:37:13 +0000 (17:37 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Mar 2017 17:37:13 +0000 (17:37 +0000)

Trivial merge