Merge remote-tracking branch 'origin/stable'

diff --cc tornado/auth.py
index 85f967cb0f4732091ee11aaef3d6c3254a7f9912,00343fb688aec01cf0de3a6b488af0fa40247d9b..586c3dae76335affa224b1f9126b63cc5f5e74b7
--- 1/tornado/auth.py
--- 2/tornado/auth.py
+++ b/tornado/auth.py
@@@ -32,9 -32,7 +32,9 @@@ They all take slightly different argume
  services implement authentication and authorization slightly differently.
  See the individual service classes below for complete documentation.
  
- Example usage for Google OpenID:
 -Example usage for Google OAuth::
++Example usage for Google OAuth:
 +
 +.. testcode::
  
      class GoogleOAuth2LoginHandler(tornado.web.RequestHandler,
                                     tornado.auth.GoogleOAuth2Mixin):