Merge branch 'hm/paint-hits-in-log-grep'