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

Trivial merge