Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py

diff --cc wrw/wmako.py
index 42619389cc1a87606e4dd8d86e0fdcc9f0af17da,13ce3424a14af3bf620cf0752d76f937e75be272..ef886fb5f2829a4a3fdece27f1b4b528904825d6
--- 1/wrw/wmako.py
--- 2/wrw/wmako.py
+++ b/wrw/wmako.py
@@@ -1,6 -1,6 +1,6 @@@
  import os, threading
  from mako import template, lookup, filters
- from . import util, form, session, env
 -import util, form, session, env, resp
++from . import util, form, session, env, resp
  
  # It seems Mako isn't thread-safe.
  makolock = threading.Lock()