Merge branch 'curl-pre-7.21.5' into release