Use a betetr way to detect netty
Merge remote-tracking branch 'origin/master'