Merge branch 'jw/doc-show-untracked-files-fix'