Fixed tests on MS Windows
Merge branch 'master' into git-status