Merge branch 'master' into user/bsergeant/close_with_params_plus_close_unittest

ixwebsocket/IXWebSocket.cpp

@@ -221,6 +221,7 @@ namespace ix
     }
 
     bool WebSocket::isConnectedOrClosing() const
+
     {
         return isConnected() || isClosing();
     }