When running "pkg" from the CLI, leave the CACHEDIR cleanup to the user
Merge remote-tracking branch 'upstream/master'