Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint