Merge pull request #4178 from ntherning/fix-broken-windows-build