fix check error on windows
Merge branch 'trunk'