Merge branch 'jc/ls-files-o'