Merge branch 'bump-netty' into 3.4-dev