Merge branch 'jc/make-dedup-ls-files-output'