Merge remote-tracking branch 'openstreetmap/pull/1122'
authorTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 19:05:16 +0000 (19:05 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 9 Mar 2016 19:05:16 +0000 (19:05 +0000)

Trivial merge