no more pypy test for today
Merge branch 'master' of github.com:web2py/web2py