branch test for windows support
Merge pull request #2681 from stefanpenner/fix-windows-build

branch test for windows support