Merge branch 'upstream-curl' into update-curl