Merge branch 'jl/maint-fetch-recursive-fix'