Merge "BSD grep: sync with upstream."