Merge branch 'master' of win:c:/m64/reg4/testsuite