web2py/web2py — pull request #340 by timrichardson (2014-01-09 12:27:08+00:00)
Title: fix to the regex added re issue 1836

I think this fixes 1848 & 1849.