From 86b8801470702bc8cb01da5b7c1fd6503ec43fb1 Mon Sep 17 00:00:00 2001
From: Ahn Ki-Wook <ahnkiwook@gmail.com>
Date: Fri, 26 Aug 2016 01:04:30 +0900
Subject: [PATCH] Update AUTHORS and CHANGELOG

---
 AUTHORS       | 1 +
 CHANGELOG.rst | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 8bbb98d9c..043de70c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Contributors include::
 
 Abdeali JK
 Abhijeet Kasurde
+Ahn Ki-Wook
 Alexei Kozlenok
 Anatoly Bubenkoff
 Andreas Zeidler
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 447b03b94..a1aea9bbd 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,11 +9,16 @@
 * Add ``buffer`` attribute to stdin stub class ``pytest.capture.DontReadFromInput``
   Thanks `@joguSD`_ for the PR.
 
+* Fix ``UnicodeEncodeError`` when string comparison with unicode has failed. (`#1864`_)
+  Thanks `@AiOO`_ for the PR
+
 *
 
 .. _@joguSD: https://github.com/joguSD
+.. _@AiOO: https://github.com/AiOO
 
 .. _#1857: https://github.com/pytest-dev/pytest/issues/1857
+.. _#1864: https://github.com/pytest-dev/pytest/issues/1864
 
 
 3.0.1