From 67a55af8f8c1c813b67c216dbb279c406a4b6f27 Mon Sep 17 00:00:00 2001
From: andrewpmontgomery <30696422+andrewpmontgomery@users.noreply.github.com>
Date: Wed, 18 Oct 2017 13:56:51 +0100
Subject: [PATCH 1/2] Update clientsidescripts.js

---
 lib/clientsidescripts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/clientsidescripts.js b/lib/clientsidescripts.js
index dd7fb230e..0ca82744a 100644
--- a/lib/clientsidescripts.js
+++ b/lib/clientsidescripts.js
@@ -178,7 +178,7 @@ functions.waitForAngular = function(rootSelector, callback) {
           }
           catch(e){}
           if (testability) {
-            return testability.whenStable(testCallback);
+            return testability.whenStable(function() { testCallback(); });
           }
         }
 

From 3b921501429e016df05f374cbce673e40df37244 Mon Sep 17 00:00:00 2001
From: andrewpmontgomery <30696422+andrewpmontgomery@users.noreply.github.com>
Date: Mon, 13 Nov 2017 17:19:40 +0000
Subject: [PATCH 2/2] Update configParser.ts

Fix for merging arrays in configs; specifically, for merging the capabilities.chromeOptions.args array
---
 lib/configParser.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/configParser.ts b/lib/configParser.ts
index d85800c44..c22c7ec0d 100644
--- a/lib/configParser.ts
+++ b/lib/configParser.ts
@@ -187,6 +187,8 @@ let merge_ = function(into: any, from: any): any {
     if (into[key] instanceof Object && !(into[key] instanceof Array) &&
         !(into[key] instanceof Function)) {
       merge_(into[key], from[key]);
+    } else if (into[key] instanceof Array && from[key] instanceof Array) {
+      into[key] = into[key].concat(from[key]);
     } else {
       into[key] = from[key];
     }