Merge remote-tracking branch 'openstreetmap/pull/1312'
authorTom Hughes <tom@compton.nu>
Mon, 10 Oct 2016 12:48:09 +0000 (13:48 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Oct 2016 12:48:09 +0000 (13:48 +0100)

Trivial merge