Merge branch 'master' into python3

Conflicts:
	wrw/util.py

diff --cc wrw/util.py
index bf78f8e,64b820f..eaa6a62
--- 1/wrw/util.py
--- 2/wrw/util.py
+++ b/wrw/util.py
@@@ -1,5 -1,5 +1,5 @@@
  import inspect
- from . import req, dispatch, session, form
 -import req, dispatch, session, form, resp
++from . import req, dispatch, session, form, resp
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):
@@@ -25,6 -16,9 +25,9 @@@ def formparams(callable)
              for arg in list(args):
                  if arg not in spec.args:
                      del args[arg]
 -        for i in xrange(len(spec.args) - len(spec.defaults)):
++        for i in range(len(spec.args) - len(spec.defaults)):
+             if spec.args[i] not in args:
+                 raise resp.httperror(400, "Missing parameter", ("The query parameter `", resp.h.code(spec.args[i]), "' is required but not supplied."))
          return callable(**args)
      return wrapper