Merge commit 'eff7017ef9032ed4d4adf1702bb32af523faefdb'

Author: Hexcles

tools/third_party/pywebsocket3/mod_pywebsocket/stream.py

@@ -875,7 +875,7 @@ def close_connection(self,
             wait_response: True when caller want to wait the response.
         Raises:
             BadOperationException: when reason is specified with code None
-            or reason is not an instance of both str and unicode.
+                or reason is not an instance of both str and unicode.
         """
 
         if self._request.server_terminated: