Merge branch 'bg/t5540-osx-grep'