Merge branch 'jc/tartree' into jc/builtin-n-tar-tree