Merge branch 'bw/submodule-sed-solaris' into maint