interim commits for twisted conn
Merge remote-tracking branch 'origin/onug-hackathon' into onug-hackathon