Merge.

Objects/unicodeobject.c

@@ -3235,7 +3235,7 @@ PyUnicode_EncodeLocale(PyObject *unicode, const char *errors)
     wchar_t *wstr;
     PyObject *bytes = NULL;
     char *errmsg;
-    PyObject *reason;
+    PyObject *reason = NULL;
     PyObject *exc;
     size_t error_pos;
     int surrogateescape;