windows test change.
Merge branch 'master' into dev_1.0