Merge branch 'tb/ls-files-eol'