Merge remote-tracking branch 'openstreetmap/pull/1445'
authorTom Hughes <tom@compton.nu>
Sun, 19 Feb 2017 11:38:27 +0000 (11:38 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 19 Feb 2017 11:38:27 +0000 (11:38 +0000)

Trivial merge