Merge "Improve archive-build macro to gzip any text file"