Merge branch 'cj/log-invert-grep'