Merge branch 'jc/require-work-tree-exists'