Anssi's web2py branches