Merge pull request #2068 from kasthack/System.Web-import