Merge "Support 'git-upload-archive'"