Merge branch 'jl/maint-submodule-gitfile-awareness'