switch to netty
Merge remote-tracking branch 'upstream/master'