Merge remote-tracking branch 'origin/master' into mb-one-display-layer-event-per-tx

Author: maxbrunsfeld

package.json

@@ -57,7 +57,7 @@
     "mkdirp": "^0.5.1",
     "pathwatcher": "8.0.1",
     "serializable": "^1.0.3",
-    "superstring": "^2.2.6",
+    "superstring": "^2.2.7",
     "underscore-plus": "^1.0.0"
   }
 }