Don't use unportable grep arguments for test
Merge branch 'hotfix-portable-test' into release-1.4