Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5