Merge branch 'bw/ls-files-recurse-submodules'