Merge branch 'master' into snyk-fix-a1bcfe4f08a62096534b9847cef9381e

Author: thiagobustamante

package-lock.json

@@ -35,6 +35,7 @@
     "glob": "^7.1.6",
     "lodash": "^4.17.21",
     "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "minimatch": "^3.0.4",
     "mkdirp": "^1.0.4",
     "path": "^0.12.7",