Merge branch 'upgrade-curl'