Merge remote-tracking branch 'openstreetmap/pull/1330'
authorTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 10:52:14 +0000 (11:52 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 19 Oct 2016 10:52:14 +0000 (11:52 +0100)

Trivial merge