From c059e0b000c12f67938cfcb24014f40ffd45f60f Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 2 Jun 2016 12:10:27 -0700
Subject: [PATCH] Update CHANGES and CONTRIBUTORS

---
 CHANGES.txt      | 3 +++
 CONTRIBUTORS.txt | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 592b997e746..806b7d2e06f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,9 @@ CHANGES
 
 - Don't crash logger when transport is None #889
 
+- Use a create_future compatibility wrapper instead of creating
+  Futures directly #896
+
 
 0.21.6 (05-05-2016)
 -------------------
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index b36cd770014..6b847da660c 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -43,6 +43,7 @@ Greg Holt
 Hugo Herter
 Igor Pavlov
 Ingmar Steen
+Jacob Champion
 Jaesung Lee
 Jashandeep Sohi
 Jeroen van der Heijden