Merge branch 'jc/maint-grep-one-thread-mutex-fix' into maint