Merge branch 'master' into advanced-permissions-phase-2

i18n/en.json

@@ -4686,6 +4686,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Invalid user id"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "We encountered an error while connecting to the server"