Merge branch 'branch3.1'

Conflicts:
	docs/releases.rst
	setup.py
	tornado/__init__.py

diff --cc docs/releases.rst
index 96f372e4f3fe8c4605362dcdd5649c73d3899b96,e72cd4ce20002ca7d3be84555b27e799d556b34f..338e30de6078da1cfd6bf75942861f9fa3730de2
--- 1/docs/releases.rst
--- 2/docs/releases.rst
+++ b/docs/releases.rst
@@@ -4,7 -4,7 +4,8 @@@ Release note
  .. toctree::
     :maxdepth: 2
  
 +   releases/next
+    releases/v3.1.1
     releases/v3.1.0
     releases/v3.0.2
     releases/v3.0.1