Merge branch 'jt/ls-files-stage-recurse'