Merge branch 'jc/show-untracked-false'