Merge branch 'bw/test-fix-grep-gnuism' into maint