Merged latest changes from web2py repo