rebase our sockjs version to master