Merge branch 'fg/submodule-non-ascii-path' into maint