Merge branch 'release-3.8'

webapp/routes/route_team.jsx

@@ -13,7 +13,6 @@ import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
 import Constants from 'utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 import * as AsyncClient from 'utils/async_client.jsx';
-import * as Utils from 'utils/utils.jsx';
 import Client from 'client/web_client.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
@@ -35,7 +34,7 @@ function doChannelChange(state, replace, callback) {
         channel = ChannelStore.getByName(state.params.channel);
 
         if (channel && channel.type === Constants.DM_CHANNEL) {
-            loadNewDMIfNeeded(Utils.getUserIdFromChannelName(channel));
+            loadNewDMIfNeeded(channel.id);
         } else if (channel && channel.type === Constants.GM_CHANNEL) {
             loadNewGMIfNeeded(channel.id);
         }