Merge remote-tracking branch 'origin/master' into sfdc-create-flow

package.json

@@ -63,7 +63,7 @@
         "c9.ide.language.javascript": "#8479d0a9c1",
         "c9.ide.language.javascript.immediate": "#0535804ada",
         "c9.ide.language.javascript.eslint": "#9b2721c3d0",
-        "c9.ide.language.javascript.tern": "#d036f013dc",
+        "c9.ide.language.javascript.tern": "#3ef5101eec",
         "c9.ide.language.javascript.infer": "#cfec494a3c",
         "c9.ide.language.jsonalyzer": "#103e701afc",
         "c9.ide.collab": "#b49eda3791",