Updated from latest web2py master