Upstream merge.
Netty 4.0.9 is out
Re add hopper checks