Merge branch 'experimental' into bwindels/roomgridview-experimental

src/stores/RoomViewStore.js

@@ -195,6 +195,11 @@ export class RoomViewStore extends Store {
                 err: err,
             });
             let msg = err.message ? err.message : JSON.stringify(err);
+            // XXX: We are relying on the error message returned by browsers here.
+            // This isn't great, but it does generalize the error being shown to users.
+            if (msg && msg.startsWith("CORS request rejected")) {
+                msg = _t("There was an error joining the room");
+            }
             if (err.errcode === 'M_INCOMPATIBLE_ROOM_VERSION') {
                 msg = <div>
                     {_t("Sorry, your homeserver is too old to participate in this room.")}<br />