Merge branch 'bb/completion-no-grep-into-awk'