Merge remote branch 'upstream/master' into dangrahttp11

Conflicts:
	scrapy/core/downloader/webclient.py
Merge branch 'http11' of github.com:redapple/scrapy into http11