Merge branch 'release-3.1'

Conflicts:
	webapp/components/create_comment.jsx

webapp/stores/post_store.jsx

@@ -552,7 +552,7 @@ PostStore.dispatchToken = AppDispatcher.register((payload) => {
 
     switch (action.type) {
     case ActionTypes.RECEIVED_POSTS: {
-        const id = PostStore.currentFocusedPostId == null ? action.id : PostStore.currentFocusedPostId;
+        const id = PostStore.currentFocusedPostId !== null && action.isPost ? PostStore.currentFocusedPostId : action.id;
         PostStore.storePosts(id, makePostListNonNull(action.post_list));
         PostStore.checkBounds(id, action.numRequested, makePostListNonNull(action.post_list), action.before);
         PostStore.emitChange();

webapp/stores/user_store.jsx

@@ -104,7 +104,7 @@ class UserStoreClass extends EventEmitter {
         this.currentUserId = user.id;
         global.window.mm_current_user_id = this.currentUserId;
         if (LocalizationStore.getLocale() !== user.locale) {
-            GlobalActions.newLocalizationSelected(user.locale);
+            setTimeout(() => GlobalActions.newLocalizationSelected(user.locale), 0);
         }
     }