Fix unit test to new gorilla websocket API
Merge branch 'master' into travis-test