Merge remote-tracking branch 'openstreetmap/pull/1085'
authorTom Hughes <tom@compton.nu>
Mon, 7 Dec 2015 14:11:35 +0000 (14:11 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 7 Dec 2015 14:11:35 +0000 (14:11 +0000)

Trivial merge