Merge branch 'master' into python3

Conflicts:
	wrw/wmako.py

diff --cc wrw/wmako.py
index 817233d,491d8b3..4261938
--- 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
 -import util, form, session, env
++from . import util, form, session, env
  
  # It seems Mako isn't thread-safe.
  makolock = threading.Lock()