Merge pull request #868 from bodash/patch-1

I continued to have websocket connection issues in Safari when using SSL...