Merging forward

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/cred-implements-implementer-7620-2@43384 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb