Cleaning up the temp file after install.
Merge branch 'release-2.1.0'