Merge branch 'sb/submodule-ignore-trailing-slash'