Merge branch 'sb/reset-recurse-submodules'