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

* commit 'f2de6b0f6e873f9cb28682b8fc6764b0ab41c6ee':
  Do not include '\0' when writing error messages to stderr