Merge branch 'jc/submodule-sync-no-auto-vivify' into maint