Merge remote-tracking branch 'openstreetmap/pull/1117'
authorTom Hughes <tom@compton.nu>
Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 31 Dec 2015 07:40:44 +0000 (07:40 +0000)

Trivial merge