Merge branch 'js/rerere-forget-protect-against-NUL' into maint