diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index f8ee607e5..73279779c 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -298,6 +298,7 @@ module.exports = (grunt) ->
   unless process.platform is 'linux' or grunt.option('no-install')
     defaultTasks.push 'install'
   grunt.registerTask('default', defaultTasks)
+  grunt.registerTask('build-and-sign', ['download-electron', 'download-electron-chromedriver', 'build', 'set-version', 'generate-asar', 'codesign:app', 'install'])
 
 getDefaultChannelAndReleaseBranch = (version) ->
   if version.match(/dev/) or isBuildingPR()
diff --git a/package.json b/package.json
index bed93e845..f51f22895 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "language-javascript": "0.110.0",
     "language-json": "0.18.0",
     "language-less": "0.29.3",
-    "language-make": "0.21.1",
+    "language-make": "0.22.0",
     "language-mustache": "0.13.0",
     "language-objective-c": "0.15.1",
     "language-perl": "0.34.0",
diff --git a/resources/win/atom.cmd b/resources/win/atom.cmd
index a1af5cd53..8a4fed05c 100644
--- a/resources/win/atom.cmd
+++ b/resources/win/atom.cmd
@@ -2,6 +2,7 @@
 
 SET EXPECT_OUTPUT=
 SET WAIT=
+SET PSARGS=%*
 
 FOR %%a IN (%*) DO (
   IF /I "%%a"=="-f"           SET EXPECT_OUTPUT=YES
@@ -25,7 +26,7 @@ FOR %%a IN (%*) DO (
 IF "%EXPECT_OUTPUT%"=="YES" (
   SET ELECTRON_ENABLE_LOGGING=YES
   IF "%WAIT%"=="YES" (
-    powershell -noexit "%~dp0\..\..\atom.exe" --pid=$pid %* ; wait-event
+    powershell -noexit "Start-Process -FilePath \"%~dp0\..\..\atom.exe\" -ArgumentList \"--pid=$pid $env:PSARGS\" ; wait-event"
   ) ELSE (
     "%~dp0\..\..\atom.exe" %*
   )
diff --git a/resources/win/atom.sh b/resources/win/atom.sh
index 7380bf122..cd90ff8fb 100644
--- a/resources/win/atom.sh
+++ b/resources/win/atom.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
-$(dirname "$0")/atom.cmd "$@"
+pushd $(dirname "$0") > /dev/null
+ATOMCMD=""$(pwd -W)"/atom.cmd"
+popd > /dev/null
+cmd.exe //c "$ATOMCMD" "$@"