Merge branch 'release-3.1'

Conflicts:
	webapp/components/create_comment.jsx

webapp/components/create_comment.jsx

@@ -147,7 +147,7 @@ class CreateComment extends React.Component {
         Client.createPost(
             post,
             () => {
-                // DO nothing. Websockets will handle this.
+                PostStore.removePendingPost(post.channel_id, post.pending_post_id);
             },
             (err) => {
                 if (err.id === 'api.post.create_post.root_id.app_error') {