Merge remote-tracking branch 'openstreetmap/pull/1174'
authorTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 18:40:41 +0000 (18:40 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 18:40:41 +0000 (18:40 +0000)

Trivial merge