diff --git a/CHANGELOG.md b/CHANGELOG.md
index 300d8692b4..5c9b581856 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ x.x.x Release notes (yyyy-MM-dd)
 ### Bugfixes
 
 * Fix CocoaPods installation with static libraries and multiple platforms.
+* Fix uncaught "Bad version number" exceptions on the notification worker thread
+  followed by deadlocks when Realms refresh.
 
 2.5.0 Release notes (2017-03-28)
 =============================================================
diff --git a/Realm/ObjectStore b/Realm/ObjectStore
index cb497bc4e7..d88499cd5c 160000
--- a/Realm/ObjectStore
+++ b/Realm/ObjectStore
@@ -1 +1 @@
-Subproject commit cb497bc4e748e860af4090776ad33276079611b6
+Subproject commit d88499cd5cc4e9a19a91b964d0d282da0fa51f98