Merge branch 'rs/maint-archive-prefix' * rs/maint-archive-prefix: Git archive and trailing "/" in prefix