Merge branch 'rm/strchrnul-not-strlen'