Clean up temp file litter
Merge pull request #6705 from tkelman/patch-4

Clean up temp file litter