Keeping up with incompatible changes in Netty
Merge