Merge branch 'jc/maint-log-grep'