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

Trivial merge