Add archive support, fix #1634#1744

stitch wants to merge 2 commits intointernetstandards:maininternetstandards/Internet.nl:mainfrom

stitch:masterstitch/Internet.nl:masterCopy head branch name to clipboard