Merge branch 'jc/sane-grep'