Merge commit 'pull/origin/1938' into ws-ping

diff --cc tornado/websocket.py
index 3f9c5f5d0d47c6152df505c5abf8658e3f980cc5,1d89b73d8e4f90d67fffa3dfbec1dc644ed0b353..dcd7e73a382a1d501af6775ce1c1bba39e8011a1
--- 1/tornado/websocket.py
--- 2/tornado/websocket.py
+++ b/tornado/websocket.py
@@@ -867,9 -856,9 +881,10 @@@ class WebSocketProtocol13(WebSocketProt
          elif opcode == 0x9:
              # Ping
              self._write_frame(True, 0xA, data)
+             self._run_callback(self.handler.on_ping, data)
          elif opcode == 0xA:
              # Pong
 +            self.last_pong = IOLoop.current().time()
              self._run_callback(self.handler.on_pong, data)
          else:
              self._abort()