Merge remote-tracking branch 'openstreetmap/pull/954'
authorTom Hughes <tom@compton.nu>
Mon, 14 Mar 2016 22:11:23 +0000 (22:11 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 14 Mar 2016 22:11:23 +0000 (22:11 +0000)

Trivial merge