Cleanup temporary files
Merge pull request #548 from romainneutron/temporary-files

[3.8] Cleanup temporary files