Merge branch 'jk/submodule-fix-loose' into maint-2.13