Merge branch 'jk/ls-files-recurse-submodules-fix'