Merge forward.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/desynchronize-2673-2@43319 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb