From 15c98018c04ebbd3301886002bc58806d20a0913 Mon Sep 17 00:00:00 2001
From: Bartosz Blimke <bartosz.blimke@gmail.com>
Date: Sun, 2 Nov 2014 14:38:31 +0100
Subject: [PATCH] Version 1.20.2

---
 CHANGELOG.md           | 6 ++++++
 README.md              | 1 +
 lib/webmock/version.rb | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f950854da..1aeb7473a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.20.2
+
+  * WebMock provides a helpful error message if an incompatible object is given as response body.
+
+      Thanks to [Mark Lorenz](https://github.com/dapplebeforedawn)
+
 ## 1.20.1
 
   * `assert_requested` and `assert_not_requested` accept `at_least_times` and `at_most_times` options
diff --git a/README.md b/README.md
index 280e3cf12..a67269a2c 100644
--- a/README.md
+++ b/README.md
@@ -932,6 +932,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Tasos Stathopoulos
 * Dan Buettner
 * Sven Riedel
+* Mark Lorenz
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.
diff --git a/lib/webmock/version.rb b/lib/webmock/version.rb
index da952306f..56ff636e9 100644
--- a/lib/webmock/version.rb
+++ b/lib/webmock/version.rb
@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.20.1' unless defined?(::WebMock::VERSION)
+  VERSION = '1.20.2' unless defined?(::WebMock::VERSION)
 end