Use safe paths in the tar archive

Don't record paths with too many '..'.
Merge branch 'master' into 'unpack'