Patch java web socket, fix CPU usage
Merge remote-tracking branch 'upstream/master'