Updated ws handlers to be conform with latest chrome.
Merge branch 'test' into dev