Merge branch 'tc/curl-vernum-output-broken-in-7.11' into maint