Merge branch 'jc/mktree'