Merge remote-tracking branch 'origin/master' into docker-vfs_pool-d9

Conflicts:
	plugins/c9.docker/daemon.js

package.json

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