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

Trivial merge