merge forward

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/tubes-1956-8@43566 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb