Merge remote-tracking branch 'openstreetmap/pull/954'
authorTom Hughes <tom@compton.nu>
Sun, 20 Mar 2016 18:47:35 +0000 (18:47 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 20 Mar 2016 18:47:35 +0000 (18:47 +0000)

Trivial merge