merge forward

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/logger-name-7652-2@43262 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb