Merge branch 'jt/submodule-pull-recurse-rebase'