Apply 7016-1.diff from adiroban

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/branches/site-requestfactory-7016@43417 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb