Merge branch 'bw/grep-recurse-submodules' into maint