Merge branch 'os/commit-submodule-ignore' into maint