Merge "Do not include '\0' when writing error messages to stderr"