merge the draft changes from https://twistedmatrix.com/trac/wiki/users/rwall/DraftNewTicketPage