Merge pull request #6936 from daverodgman/patch-1-2.28

Use `grep -E` instead of `egrep`