Merge remote-tracking branch 'origin/master' into revert-14156-revert-13838-vfs-fix-collab-code-reverting

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2651",
+    "version": "3.1.2658",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",