Netty 3 updates

If you want the Netty 4 branch instead / in addition on a branch, let me know.