make Jython happy, polish for release
Merge branch 'master' into permessage_deflate