More resilient tests (again)
Merge branch 'master' of github.com:yesodweb/wai into wai2