WebSockets integration step 2
Merge remote-tracking branch 'origin/master'