Merge remote-tracking branch 'openstreetmap/pull/788'
authorTom Hughes <tom@compton.nu>
Tue, 16 Aug 2016 18:11:35 +0000 (19:11 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 16 Aug 2016 18:11:35 +0000 (19:11 +0100)

Trivial merge