Merge remote-tracking branch 'openstreetmap/pull/1309'
authorTom Hughes <tom@compton.nu>
Wed, 12 Oct 2016 18:11:07 +0000 (19:11 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 12 Oct 2016 18:11:07 +0000 (19:11 +0100)

Trivial merge