Update Vanilla for Netty4

Signed-off-by: Jack Huey kitskub@gmail.com
Merge branch 'netty4'