Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch