Web2py 2.6.1 support
Merge branch 'master' of https://github.com/espern/tiny_website