Merge pull request #1332 from kurtmckee/fix-tests-on-windows-issue-1331