Fix issue #6701. Use shutil.move instead of os.rename.
Merge pull request #126 from markir9/master

Fix issue #6701. Use shutil.move instead of os.rename.