diff --git a/AUTHORS.rst b/AUTHORS.rst
index 8faaddd..4dd3044 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -31,6 +31,7 @@ Paul McLanahan <paul@mclanahan.net>
 Philipp Steinhardt <steinhardt@myvision.de>
 Rinat Shigapov <rinatshigapov@gmail.com>
 Rodney Folz <rodney@rodneyfolz.com>
+Romain Garrigues <github.com/romgar>
 rsenkbeil <github.com/rsenkbeil>
 Ryan Kaskel <dev@ryankaskel.com>
 Simon Meers <simon@simonmeers.com>
diff --git a/CHANGES.rst b/CHANGES.rst
index a46440e..421c6bf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ CHANGES
 master (unreleased)
 -------------------
 
+* Fix infinite recursion with multiple `MonitorField` and `defer()` or `only()`
+on Django 1.10+. Thanks Romain Garrigues. Merge of #242, fixes #241.
+
 
 2.6 (2016.09.19)
 ----------------