Merge "Avoid position sensitive argument errors with tar"