Merge branch 'jc/ls-files-ignored-pathspec'