3 files changed, 16 insertions, 9 deletions

diff --git a/build/lib/util.js b/build/lib/util.js
index 59c9b9b4d98..b3b8cd6214f 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -73,11 +73,11 @@ function setExecutableBit(pattern) {
         return setBit;

     }

     var input = es.through();

-    var _filter = _filter(pattern, { restore: true });

+    var filter = _filter(pattern, { restore: true });

     var output = input

-        .pipe(_filter)

+        .pipe(filter)

         .pipe(setBit)

-        .pipe(_filter.restore);

+        .pipe(filter.restore);

     return es.duplex(input, output);

 }

 exports.setExecutableBit = setExecutableBit;

diff --git a/build/lib/util.ts b/build/lib/util.ts
index 03a98f29c7c..6264efb93e2 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -102,11 +102,11 @@ export function setExecutableBit(pattern: string | string[]): NodeJS.ReadWriteSt
 	}
 
 	var input = es.through();
-	var _filter = _filter(pattern, { restore: true });
+	var filter = _filter(pattern, { restore: true });
 	var output = input
-		.pipe(_filter)
+		.pipe(filter)
 		.pipe(setBit)
-		.pipe(_filter.restore);
+		.pipe(filter.restore);
 
 	return es.duplex(input, output);
 }
diff --git a/gulpfile.js b/gulpfile.js
index cb425f3016a..47e5bc20f07 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -38,6 +38,15 @@ gulp.task('compile-build', ['compile-client-build', 'compile-extensions-build'])
 gulp.task('watch-build', ['watch-client-build', 'watch-extensions-build']);
 
 var ALL_EDITOR_TASKS = [
+	// Always defined tasks
+	'clean-client',
+	'compile-client',
+	'watch-client',
+	'clean-client-build',
+	'compile-client-build',
+	'watch-client-build',
+
+	// Editor tasks (defined in gulpfile.editor)
 	'clean-optimized-editor',
 	'optimize-editor',
 	'clean-minified-editor',
@@ -46,9 +55,7 @@ var ALL_EDITOR_TASKS = [
 	'editor-distro',
 	'analyze-editor-distro'
 ];
-var runningEditorTasks = process.argv.slice(2).every(function(arg) {
-	return (ALL_EDITOR_TASKS.indexOf(arg) !== -1);
-});
+var runningEditorTasks = process.argv.length > 2 && process.argv.slice(2).every(function(arg) { return (ALL_EDITOR_TASKS.indexOf(arg) !== -1); });
 
 if (runningEditorTasks) {
 	require(`./build/gulpfile.editor`);