Merge remote-tracking branch 'openstreetmap/pull/1344'
authorTom Hughes <tom@compton.nu>
Thu, 27 Oct 2016 10:51:36 +0000 (11:51 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Oct 2016 10:51:36 +0000 (11:51 +0100)

Trivial merge