Use proper temp files for extraction.
Merge branch 'master' into develop