Merge "Fix run-test.sh in MSys"