Merge remote-tracking branch 'origin/master' into docker-lb-no-cpulimit

Conflicts:
	plugins/c9.docker/actions.js
	settings/deploy-logicblox.js

package.json

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