note xmlrpclib doesn't verify certs (yet)
merge 3.3
merge heads