Merging forward

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/deprecated-instance-methods-4804-2@43535 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb