Merge branch 'sb/submodule-helper-remove-cruft'