Merge pull request #3753 from henricm/enable-windowsbase-tests-on-windows