diff --git a/ChangeLog.md b/ChangeLog.md
index 75827603..f0654ea2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. This projec
 
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.1.0...HEAD)
 
+- Unit test fails when doing a CMake out-of-tree build [\#241](https://github.com/nlohmann/json/issues/241)
 - Additional integration options [\#237](https://github.com/nlohmann/json/issues/237)
 - Can't use basic\_json::iterator as a base iterator for std::move\_iterator [\#233](https://github.com/nlohmann/json/issues/233)
 - Provide a FAQ [\#163](https://github.com/nlohmann/json/issues/163)
@@ -13,6 +14,8 @@ All notable changes to this project will be documented in this file. This projec
 - Add support for afl-fuzz testing [\#207](https://github.com/nlohmann/json/pull/207) ([mykter](https://github.com/mykter))
 - Issue \#178 - Extending support to full uint64\_t/int64\_t range and unsigned type \(updated\) [\#193](https://github.com/nlohmann/json/pull/193) ([twelsby](https://github.com/twelsby))
 
+- -Wconversion warnings [\#239](https://github.com/nlohmann/json/issues/239)
+- ambiguous overload for 'push\_back' and 'operator+=' [\#235](https://github.com/nlohmann/json/issues/235)
 - double values are serialized with commas as decimal points [\#228](https://github.com/nlohmann/json/issues/228)
 - Move semantics with std::initializer\_list [\#225](https://github.com/nlohmann/json/issues/225)
 - abort during getline in yyfill [\#223](https://github.com/nlohmann/json/issues/223)
@@ -28,6 +31,7 @@ All notable changes to this project will be documented in this file. This projec
 - Conflicting typedef of ssize\_t on Windows 32 bit when using Boost.Python [\#204](https://github.com/nlohmann/json/issues/204)
 - Integer conversion to unsigned [\#178](https://github.com/nlohmann/json/issues/178)
 
+- Out of tree builds and a few other miscellaneous CMake cleanups. [\#242](https://github.com/nlohmann/json/pull/242) ([ChrisKitching](https://github.com/ChrisKitching))
 - Implement additional integration options [\#238](https://github.com/nlohmann/json/pull/238) ([robertmrk](https://github.com/robertmrk))
 - make serialization locale-independent [\#232](https://github.com/nlohmann/json/pull/232) ([nlohmann](https://github.com/nlohmann))
 - fixes \#223 by updating README.md [\#227](https://github.com/nlohmann/json/pull/227) ([kevin--](https://github.com/kevin--))
diff --git a/src/json.hpp b/src/json.hpp
index 4c47abc4..d06849ff 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -9954,7 +9954,7 @@ basic_json_parser_63:
     */
     static basic_json diff(const basic_json& source,
                            const basic_json& target,
-                           std::string path = "") noexcept
+                           std::string path = "")
     {
         // the patch
         basic_json result(value_t::array);
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index 9703b413..151e95ae 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -9264,7 +9264,7 @@ class basic_json
     */
     static basic_json diff(const basic_json& source,
                            const basic_json& target,
-                           std::string path = "") noexcept
+                           std::string path = "")
     {
         // the patch
         basic_json result(value_t::array);