Merge branch 'pb/pull-rebase-recurse-submodules'