Code

Merge branch 'nd/war-on-nul-in-commit'