diff --git a/package.json b/package.json
index 379389bfa84..30cf90f86ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Brackets",
-    "version": "0.34.0-0",
+    "version": "0.34.1-0",
     "apiVersion": "0.34.0",
     "homepage": "http://brackets.io",
     "issues": {
diff --git a/src/config.json b/src/config.json
index 974cc8c321a..1ca3ca2a66c 100644
--- a/src/config.json
+++ b/src/config.json
@@ -18,7 +18,7 @@
         "linting.enabled_by_default": true
     },
     "name": "Brackets",
-    "version": "0.34.0-0",
+    "version": "0.34.1-0",
     "apiVersion": "0.34.0",
     "homepage": "http://brackets.io",
     "issues": {
diff --git a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
index adb1d3f8b48..7669c917f99 100644
--- a/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
+++ b/src/extensions/default/JavaScriptCodeHints/ScopeManager.js
@@ -201,12 +201,20 @@ define(function (require, exports, module) {
      * @return {boolean} true if excluded, false otherwise.
      */
     function isFileExcluded(file) {
+        if (file.name[0] === ".") {
+            return true;
+        }
+        
+        var languageID = LanguageManager.getLanguageForPath(file.fullPath).getId();
+        if (languageID !== HintUtils.LANGUAGE_ID) {
+            return true;
+        }
+        
         var excludes = preferences.getExcludedFiles();
-
         if (!excludes) {
             return false;
         }
-
+        
         return excludes.test(file.name);
     }
 
@@ -900,11 +908,8 @@ define(function (require, exports, module) {
             FileSystem.resolve(dir, function (err, directory) {
                 function visitor(entry) {
                     if (entry.isFile) {
-                        if (!isFileExcluded(entry) && entry.name.indexOf(".") !== 0) { // ignore .dotfiles
-                            var languageID = LanguageManager.getLanguageForPath(entry.fullPath).getId();
-                            if (languageID === HintUtils.LANGUAGE_ID) {
-                                addFilesToTern([entry.fullPath]);
-                            }
+                        if (!isFileExcluded(entry)) { // ignore .dotfiles and non-.js files
+                            addFilesToTern([entry.fullPath]);
                         }
                     } else {
                         return !isDirectoryExcluded(entry.fullPath) &&
diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2
index 01e9fbb6496..73b135712a2 160000
--- a/src/thirdparty/CodeMirror2
+++ b/src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 01e9fbb6496cda9e3e8fb3b29b4830770cebe642
+Subproject commit 73b135712a21f9481641547b848100345bc5b7f1