Updates for 2.5#29

jkdaza wants to merge 4 commits intoTwistedInteractive:masterTwistedInteractive/author_roles:masterfrom

jkdaza:masterjkdaza/author_roles:masterCopy head branch name to clipboard