Merge forward.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/internet-utils-mergs-6240-2@37874 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb