Merge pull request #13159 from neheb/sed