Merge branch 'master', remote-tracking branch 'origin' into beta
fixed a memory leak related to https://twistedmatrix.com/trac/ticket/5487