Merge remote-tracking branch 'openstreetmap/pull/1336'
authorTom Hughes <tom@compton.nu>
Wed, 26 Oct 2016 14:35:18 +0000 (15:35 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Oct 2016 14:35:18 +0000 (15:35 +0100)

Trivial merge