Merge pull request #6269 from natural-law/develop

Solve the problem of setup.py on windows.