Merge branch 'release-3.5'

webapp/routes/route_team.jsx

@@ -29,13 +29,16 @@ function doChannelChange(state, replace, callback) {
         channel = JSON.parse(state.location.query.fakechannel);
     } else {
         channel = ChannelStore.getByName(state.params.channel);
-        if (!channel) {
-            channel = ChannelStore.getMoreByName(state.params.channel);
-        }
+
         if (!channel) {
             Client.joinChannelByName(
                 state.params.channel,
                 (data) => {
+                    AppDispatcher.handleServerAction({
+                        type: ActionTypes.RECEIVED_CHANNEL,
+                        channel: data
+                    });
+
                     GlobalActions.emitChannelClickEvent(data);
                     callback();
                 },