diff --git a/release.sh b/release.sh
index ab2eae788..0f4ab4086 100755
--- a/release.sh
+++ b/release.sh
@@ -281,7 +281,7 @@ fi
 echo "updating master branch"
 git checkout master
 git pull
-git merge --ff-only "$rel_branch"
+git merge "$rel_branch"
 
 # push master  and docs (if generated) to github
 git push origin master
diff --git a/src/client.js b/src/client.js
index 951dbcdbb..5a9481122 100644
--- a/src/client.js
+++ b/src/client.js
@@ -51,6 +51,10 @@ import Crypto from './crypto';
 import { isCryptoAvailable } from './crypto';
 import { encodeRecoveryKey, decodeRecoveryKey } from './crypto/recoverykey';
 
+// Disable warnings for now: we use deprecated bluebird functions
+// and need to migrate, but they spam the console with warnings.
+Promise.config({warnings: false});
+
 const LAZY_LOADING_MESSAGES_FILTER = {
     lazy_load_members: true,
 };
diff --git a/src/store/indexeddb-local-backend.js b/src/store/indexeddb-local-backend.js
index e0ada7904..e3ae1c1ae 100644
--- a/src/store/indexeddb-local-backend.js
+++ b/src/store/indexeddb-local-backend.js
@@ -83,7 +83,7 @@ function txnAsPromise(txn) {
             resolve(event);
         };
         txn.onerror = function(event) {
-            reject(event);
+            reject(event.target.error);
         };
     });
 }
@@ -94,7 +94,7 @@ function reqAsEventPromise(req) {
             resolve(event);
         };
         req.onerror = function(event) {
-            reject(event);
+            reject(event.target.error);
         };
     });
 }