Merge pull request #16255 from stangri/master-curl