Merge "Update to curl 7.61.0 - July 11 2018."
am: 4855cc3da3

Change-Id: I8c62011b17b4bff6badb027e5e6249eeb2d6f8b5