Merge pull request #695 from mfournier/curlopt_username-fixups