Merge branch 'master' into develop

yarn.lock

@@ -2250,10 +2250,10 @@
     emojibase "^15.3.1"
     emojibase-data "^15.3.1"
 
-"@matrix-org/matrix-sdk-crypto-wasm@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.0.1.tgz#e258ef84bcc7889f0e7eb3a7dbecf0830a6dd606"
-  integrity sha512-CgLpHs6nTw5pjSsMBi9xbQnBXf2l8YhImQP9cv8nbGSCYdYjFI0FilMXffzjWV5HThpNHri/3pF20ahZtuS3VA==
+"@matrix-org/matrix-sdk-crypto-wasm@^14.2.0":
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-14.2.0.tgz#1d6bddb2f777ac1674546467aab6f8584a7f2e71"
+  integrity sha512-xYbH1Yg8YwfXxGsCVDypiRvSVYPnCybsoRqlBDuAvIOs9tOfmdeeJqN+3VxvLWH28g3CtJs+9Afw8dYSHViTFg==
 
 "@matrix-org/olm@3.2.15":
   version "3.2.15"
@@ -9218,12 +9218,13 @@ matrix-events-sdk@0.0.1:
   resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "37.6.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c35c7d1a3be073e0922cf28f13225805fc2a78f8"
+matrix-js-sdk@37.7.0:
+  version "37.7.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-37.7.0.tgz#8106de841188c0b293f05978eab7043ddfd1b5ef"
+  integrity sha512-Lq4k/pbMwHsjsPHavVkiwyX0eId/XdNzYZlSvynwCTOU8VfN+i7/9fQFK0MqYD/95CgeWSI2o7h1bq1vDAzbYw==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@matrix-org/matrix-sdk-crypto-wasm" "^14.0.1"
+    "@matrix-org/matrix-sdk-crypto-wasm" "^14.2.0"
     "@matrix-org/olm" "3.2.15"
     another-json "^0.2.0"
     bs58 "^6.0.0"