diff --git a/atom.gyp b/atom.gyp
index 61f491148487..9c767ca32702 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -247,7 +247,6 @@
             # include its dependencies here.
             'vendor/node/deps/cares/cares.gyp:cares',
             'vendor/node/deps/http_parser/http_parser.gyp:http_parser',
-            'vendor/node/deps/openssl/openssl.gyp:openssl',
             'vendor/node/deps/uv/uv.gyp:libuv',
             'vendor/node/deps/zlib/zlib.gyp:zlib',
             # Build with breakpad support.
diff --git a/common.gypi b/common.gypi
index 2ca01a1e8b17..afed8fe29771 100644
--- a/common.gypi
+++ b/common.gypi
@@ -43,6 +43,7 @@
         'msvs_disabled_warnings': [
           4703,  # potentially uninitialized local pointer variable 'req' used
           4013,  # 'free' undefined; assuming extern returning int
+          4018,  # signed/unsigned mismatch
           4054,  #
           4057,  # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
           4189,  #
@@ -146,6 +147,12 @@
               '-Wno-empty-body',
             ],
           }],  # OS=="linux"
+          ['OS=="win"', {
+            'msvs_disabled_warnings': [
+              # unreferenced local function has been removed.
+              4505,
+            ],
+          }],  # OS=="win"
         ],
       }],
       ['_type in ["executable", "shared_library"]', {
diff --git a/vendor/brightray b/vendor/brightray
index d4c8ac2565a2..71a4624adf2e 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit d4c8ac2565a2e257c37215d9b65d6dd0267aad1b
+Subproject commit 71a4624adf2e95ee57138d6f5f1b5c469c20c4b4