Merge branch 'master' into PLT-93

web/react/package.json

@@ -8,7 +8,8 @@
     "keymirror": "0.1.1",
     "object-assign": "3.0.0",
     "react-zeroclipboard-mixin": "0.1.0",
-    "twemoji": "1.4.1"
+    "twemoji": "1.4.1",
+    "babel-runtime": "5.8.24"
   },
   "devDependencies": {
     "browserify": "11.0.1",
@@ -26,8 +27,8 @@
   },
   "browserify": {
     "transform": [
-      "babelify",
-      "envify"
+        ["babelify", { "optional": ["runtime"] }],
+        "envify"
     ]
   },
   "jest": {