Merge in Netty changes from Spigot by md_5

Signed-off-by: Steven Downer <grinch@outlook.com>