Merge branch 'jm/mergetool-submodules' into maint