Upgrade to Netty 3.6.4
Merge pull request #1069 from nremond/netty

Upgrade to Netty 3.6.4