Merge branch 'master' into break-circrefs

diff --cc tornado/concurrent.py
Simple merge

diff --cc tornado/gen.py
index 14798ae2f1093e12d21caa095893cfc31e2f49d2,d7df3b52f3cb4686d8e8da951a783f7e223a3963..8e6a5940d907ece2898e6112569f352eaa6f2b9d
--- 1/tornado/gen.py
--- 2/tornado/gen.py
+++ b/tornado/gen.py
@@@ -294,8 -314,7 +314,8 @@@ def _make_coroutine_wrapper(func, repla
                  except Exception:
                      future.set_exc_info(sys.exc_info())
                  else:
-                     Runner(result, future, yielded)
+                     _futures_to_runners[future] = Runner(result, future, yielded)
 +                yielded = None
                  try:
                      return future
                  finally:

diff --cc tornado/http1connection.py
Simple merge

diff --cc tornado/test/gen_test.py
Simple merge

diff --cc tornado/util.py
index de0b2e5b0c9d99b7c6e8ea700560bea4f1f3900a,d0f83d1ff9be434d7c12cb72c105431354e46d5b..186995f368c002357257ce4204ae3c56774321a4
--- 1/tornado/util.py
--- 2/tornado/util.py
+++ b/tornado/util.py
@@@ -171,15 -193,7 +193,11 @@@ def exec_in(code, glob, loc=None)
  if PY3:
      exec("""
  def raise_exc_info(exc_info):
 -    raise exc_info[1].with_traceback(exc_info[2])
 +    try:
 +        raise exc_info[1].with_traceback(exc_info[2])
 +    finally:
 +        exc_info = None
 +
- def exec_in(code, glob, loc=None):
-     if isinstance(code, str):
-         code = compile(code, '<string>', 'exec', dont_inherit=True)
-     exec(code, glob, loc)
  """)
  else:
      exec("""