Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-14

# Conflicts:
#	package.json
#	yarn.lock

[ci skip]

package.json

@@ -37,7 +37,10 @@
     "core-js": "^2.4.1",
     "cropper": "^2.3.0",
     "css-loader": "^1.0.0",
+<<<<<<< HEAD
     "d3": "4.12.2",
+=======
+>>>>>>> upstream/master
     "d3-array": "^1.2.1",
     "d3-axis": "^1.0.8",
     "d3-brush": "^1.0.4",

yarn.lock

@@ -3874,12 +3874,15 @@ https-proxy-agent@^2.2.1:
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
+<<<<<<< HEAD
 
 iconv-lite@0.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
+=======
+>>>>>>> upstream/master
 
 iconv-lite@0.4.15:
   version "0.4.15"