Merge pull request #3727 from henricm/fix-system-web-on-windows