Merge branch 'jk/submodule-fsck-loose' into maint