Merge pull request #1941 from kasthack/system.web-fixes