diff --git a/components/forms/input/inline.jsx b/components/forms/input/inline.jsx
index 060268e33f..06c5e78a15 100644
--- a/components/forms/input/inline.jsx
+++ b/components/forms/input/inline.jsx
@@ -99,6 +99,7 @@ const defaultProps = {
 class InlineEdit extends React.Component {
 	constructor (props) {
 		super(props);
+
 		this.state = {
 			isEditing: false,
 			value: null,
@@ -115,6 +116,13 @@ class InlineEdit extends React.Component {
 		}
 	}
 
+	handleCloseBtnClick = () => {
+		this.endEditMode();
+		setTimeout(() => {
+			this.editButtonRef.focus();
+		}, 100);
+	};
+
 	endEditMode = (option) => {
 		if (this.willSave) {
 			clearTimeout(this.willSave);
@@ -212,8 +220,8 @@ class InlineEdit extends React.Component {
 							category="utility"
 							name="close"
 							position="right"
-							onClick={this.endEditMode}
-							tabIndex="-1"
+							onBlur={this.handleBlur}
+							onClick={this.handleCloseBtnClick}
 						/>
 					) : null
 				}
@@ -221,6 +229,9 @@ class InlineEdit extends React.Component {
 				inlineEditTrigger={
 					<Button
 						assistiveText={assistiveText}
+						buttonRef={(component) => {
+							if (component) this.editButtonRef = component;
+						}}
 						className="slds-m-left_x-small"
 						disabled={disabled}
 						iconName="edit"
@@ -229,7 +240,6 @@ class InlineEdit extends React.Component {
 						variant="icon"
 					/>
 				}
-				onBlur={this.handleBlur}
 				onChange={this.handleChange}
 				onClick={!this.state.isEditing ? this.triggerEditMode : null}
 				onKeyDown={this.handleKeyDown}
diff --git a/package-lock.json b/package-lock.json
index 3db50b6f6f..34f85a11e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,111 +1,164 @@
 {
 	"name": "design-system-react",
-	"version": "0.8.13",
+	"version": "0.8.14",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
 		"@babel/code-frame": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz",
-			"integrity": "sha512-sW77BFwJ48YvQp3Gzz5xtAUiXuYOL2aMJKDwiaY3OcvdqBFurtYfOpSa4QrNyDxmOGRFSYzUpabU2m9QrlWE7w==",
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz",
+			"integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==",
 			"dev": true,
 			"requires": {
-				"chalk": "2.3.0",
+				"@babel/highlight": "7.0.0-beta.44"
+			}
+		},
+		"@babel/generator": {
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz",
+			"integrity": "sha512-5xVb7hlhjGcdkKpMXgicAVgx8syK5VJz193k0i/0sLP6DzE6lRrU1K3B/rFefgdo9LPGMAOOOAWW4jycj07ShQ==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "7.0.0-beta.44",
+				"jsesc": "2.5.1",
+				"lodash": "4.17.5",
+				"source-map": "0.5.7",
+				"trim-right": "1.0.1"
+			},
+			"dependencies": {
+				"jsesc": {
+					"version": "2.5.1",
+					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz",
+					"integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=",
+					"dev": true
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+					"dev": true
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz",
+			"integrity": "sha512-MHRG2qZMKMFaBavX0LWpfZ2e+hLloT++N7rfM3DYOMUOGCD8cVjqZpwiL8a0bOX3IYcQev1ruciT0gdFFRTxzg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "7.0.0-beta.44",
+				"@babel/template": "7.0.0-beta.44",
+				"@babel/types": "7.0.0-beta.44"
+			}
+		},
+		"@babel/helper-get-function-arity": {
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz",
+			"integrity": "sha512-w0YjWVwrM2HwP6/H3sEgrSQdkCaxppqFeJtAnB23pRiJB5E/O9Yp7JAAeWBl+gGEgmBFinnTyOv2RN7rcSmMiw==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "7.0.0-beta.44"
+			}
+		},
+		"@babel/helper-split-export-declaration": {
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz",
+			"integrity": "sha512-aQ7QowtkgKKzPGf0j6u77kBMdUFVBKNHw2p/3HX/POt5/oz8ec5cs0GwlgM8Hz7ui5EwJnzyfRmkNF1Nx1N7aA==",
+			"dev": true,
+			"requires": {
+				"@babel/types": "7.0.0-beta.44"
+			}
+		},
+		"@babel/highlight": {
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
+			"integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
+			"dev": true,
+			"requires": {
+				"chalk": "2.4.0",
 				"esutils": "2.0.2",
 				"js-tokens": "3.0.2"
 			},
 			"dependencies": {
 				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 					"dev": true,
 					"requires": {
 						"color-convert": "1.9.1"
 					}
 				},
 				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+					"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "3.2.0",
+						"ansi-styles": "3.2.1",
 						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
+						"supports-color": "5.4.0"
 					}
 				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
 				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"version": "5.4.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+					"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 					"dev": true,
 					"requires": {
-						"has-flag": "2.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
 		},
-		"@babel/helper-function-name": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz",
-			"integrity": "sha512-/SGPOyifPf20iTrMN+WdlY2MbKa7/o4j7B/4IAsdOusASp2icT+Wcdjf4tjJHaXNX8Pe9bpgVxLNxhRvcf8E5w==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-get-function-arity": "7.0.0-beta.36",
-				"@babel/template": "7.0.0-beta.36",
-				"@babel/types": "7.0.0-beta.36"
-			}
-		},
-		"@babel/helper-get-function-arity": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz",
-			"integrity": "sha512-vPPcx2vsSoDbcyWr9S3nd0FM3B4hEXnt0p1oKpwa08GwK0fSRxa98MyaRGf8suk8frdQlG1P3mDrz5p/Rr3pbA==",
-			"dev": true,
-			"requires": {
-				"@babel/types": "7.0.0-beta.36"
-			}
-		},
 		"@babel/template": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.36.tgz",
-			"integrity": "sha512-mUBi90WRyZ9iVvlWLEdeo8gn/tROyJdjKNC4W5xJTSZL+9MS89rTJSqiaJKXIkxk/YRDL/g/8snrG/O0xl33uA==",
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
+			"integrity": "sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.0.0-beta.36",
-				"@babel/types": "7.0.0-beta.36",
-				"babylon": "7.0.0-beta.36",
+				"@babel/code-frame": "7.0.0-beta.44",
+				"@babel/types": "7.0.0-beta.44",
+				"babylon": "7.0.0-beta.44",
 				"lodash": "4.17.5"
 			},
 			"dependencies": {
 				"babylon": {
-					"version": "7.0.0-beta.36",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.36.tgz",
-					"integrity": "sha512-rw4YdadGwajAMMRl6a5swhQ0JCOOFyaYCfJ0AsmNBD8uBD/r4J8mux7wBaqavvFKqUKQYWOzA1Speams4YDzsQ==",
+					"version": "7.0.0-beta.44",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+					"integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
 					"dev": true
 				}
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.36.tgz",
-			"integrity": "sha512-OTUb6iSKVR/98dGThRJ1BiyfwbuX10BVnkz89IpaerjTPRhDfMBfLsqmzxz5MiywUOW4M0Clta0o7rSxkfcuzw==",
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz",
+			"integrity": "sha512-UHuDz8ukQkJCDASKHf+oDt3FVUzFd+QYfuBIsiNu/4+/ix6pP/C+uQZJ6K1oEfbCMv/IKWbgDEh7fcsnIE5AtA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.0.0-beta.36",
-				"@babel/helper-function-name": "7.0.0-beta.36",
-				"@babel/types": "7.0.0-beta.36",
-				"babylon": "7.0.0-beta.36",
+				"@babel/code-frame": "7.0.0-beta.44",
+				"@babel/generator": "7.0.0-beta.44",
+				"@babel/helper-function-name": "7.0.0-beta.44",
+				"@babel/helper-split-export-declaration": "7.0.0-beta.44",
+				"@babel/types": "7.0.0-beta.44",
+				"babylon": "7.0.0-beta.44",
 				"debug": "3.1.0",
-				"globals": "11.3.0",
+				"globals": "11.4.0",
 				"invariant": "2.2.2",
 				"lodash": "4.17.5"
 			},
 			"dependencies": {
 				"babylon": {
-					"version": "7.0.0-beta.36",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.36.tgz",
-					"integrity": "sha512-rw4YdadGwajAMMRl6a5swhQ0JCOOFyaYCfJ0AsmNBD8uBD/r4J8mux7wBaqavvFKqUKQYWOzA1Speams4YDzsQ==",
+					"version": "7.0.0-beta.44",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+					"integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
 					"dev": true
 				},
 				"debug": {
@@ -118,17 +171,17 @@
 					}
 				},
 				"globals": {
-					"version": "11.3.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
-					"integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
+					"version": "11.4.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz",
+					"integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA==",
 					"dev": true
 				}
 			}
 		},
 		"@babel/types": {
-			"version": "7.0.0-beta.36",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.36.tgz",
-			"integrity": "sha512-PyAORDO9um9tfnrddXgmWN9e6Sq9qxraQIt5ynqBOSXKA5qvK1kUr+Q3nSzKFdzorsiK+oqcUnAFvEoKxv9D+Q==",
+			"version": "7.0.0-beta.44",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz",
+			"integrity": "sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==",
 			"dev": true,
 			"requires": {
 				"esutils": "2.0.2",
@@ -1431,23 +1484,23 @@
 			}
 		},
 		"babel-eslint": {
-			"version": "8.2.1",
-			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.1.tgz",
-			"integrity": "sha512-RzdVOyWKQRUnLXhwLk+eKb4oyW+BykZSkpYwFhM4tnfzAG5OWfvG0w/uyzMp5XKEU0jN82+JefHr39bG2+KhRQ==",
+			"version": "8.2.3",
+			"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.3.tgz",
+			"integrity": "sha512-0HeSTtaXg/Em7FCUWxwOT+KeFSO1O7LuRuzhk7g+1BjwdlQGlHq4OyMi3GqGxrNfEq8jEi6Hmt5ylEQUhurgiQ==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "7.0.0-beta.36",
-				"@babel/traverse": "7.0.0-beta.36",
-				"@babel/types": "7.0.0-beta.36",
-				"babylon": "7.0.0-beta.36",
+				"@babel/code-frame": "7.0.0-beta.44",
+				"@babel/traverse": "7.0.0-beta.44",
+				"@babel/types": "7.0.0-beta.44",
+				"babylon": "7.0.0-beta.44",
 				"eslint-scope": "3.7.1",
 				"eslint-visitor-keys": "1.0.0"
 			},
 			"dependencies": {
 				"babylon": {
-					"version": "7.0.0-beta.36",
-					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.36.tgz",
-					"integrity": "sha512-rw4YdadGwajAMMRl6a5swhQ0JCOOFyaYCfJ0AsmNBD8uBD/r4J8mux7wBaqavvFKqUKQYWOzA1Speams4YDzsQ==",
+					"version": "7.0.0-beta.44",
+					"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
+					"integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
 					"dev": true
 				}
 			}
@@ -4302,7 +4355,7 @@
 			"requires": {
 				"globby": "5.0.0",
 				"is-path-cwd": "1.0.0",
-				"is-path-in-cwd": "1.0.0",
+				"is-path-in-cwd": "1.0.1",
 				"object-assign": "4.1.1",
 				"pify": "2.3.0",
 				"pinkie-promise": "2.0.1",
@@ -5072,32 +5125,32 @@
 			}
 		},
 		"eslint": {
-			"version": "4.17.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.17.0.tgz",
-			"integrity": "sha512-AyxBUCANU/o/xC0ijGMKavo5Ls3oK6xykiOITlMdjFjrKOsqLrA7Nf5cnrDgcKrHzBirclAZt63XO7YZlVUPwA==",
+			"version": "4.19.1",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+			"integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
 			"dev": true,
 			"requires": {
 				"ajv": "5.5.2",
 				"babel-code-frame": "6.26.0",
-				"chalk": "2.3.0",
+				"chalk": "2.4.0",
 				"concat-stream": "1.6.0",
 				"cross-spawn": "5.1.0",
 				"debug": "3.1.0",
 				"doctrine": "2.1.0",
 				"eslint-scope": "3.7.1",
 				"eslint-visitor-keys": "1.0.0",
-				"espree": "3.5.3",
-				"esquery": "1.0.0",
+				"espree": "3.5.4",
+				"esquery": "1.0.1",
 				"esutils": "2.0.2",
 				"file-entry-cache": "2.0.0",
 				"functional-red-black-tree": "1.0.1",
 				"glob": "7.1.2",
-				"globals": "11.3.0",
+				"globals": "11.4.0",
 				"ignore": "3.3.7",
 				"imurmurhash": "0.1.4",
 				"inquirer": "3.3.0",
 				"is-resolvable": "1.1.0",
-				"js-yaml": "3.10.0",
+				"js-yaml": "3.11.0",
 				"json-stable-stringify-without-jsonify": "1.0.1",
 				"levn": "0.3.0",
 				"lodash": "4.17.5",
@@ -5108,6 +5161,7 @@
 				"path-is-inside": "1.0.2",
 				"pluralize": "7.0.0",
 				"progress": "2.0.0",
+				"regexpp": "1.1.0",
 				"require-uncached": "1.0.3",
 				"semver": "5.5.0",
 				"strip-ansi": "4.0.0",
@@ -5123,23 +5177,23 @@
 					"dev": true
 				},
 				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 					"dev": true,
 					"requires": {
 						"color-convert": "1.9.1"
 					}
 				},
 				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+					"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "3.2.0",
+						"ansi-styles": "3.2.1",
 						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
+						"supports-color": "5.4.0"
 					}
 				},
 				"debug": {
@@ -5152,15 +5206,21 @@
 					}
 				},
 				"globals": {
-					"version": "11.3.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
-					"integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
+					"version": "11.4.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz",
+					"integrity": "sha512-Dyzmifil8n/TmSqYDEXbm+C8yitzJQqQIlJQLNRMwa+BOUJpRC19pyVeN12JAjt61xonvXjtff+hJruTRXn5HA==",
+					"dev": true
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
 					"dev": true
 				},
 				"js-yaml": {
-					"version": "3.10.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-					"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+					"version": "3.11.0",
+					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+					"integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
 					"dev": true,
 					"requires": {
 						"argparse": "1.0.9",
@@ -5177,12 +5237,12 @@
 					}
 				},
 				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"version": "5.4.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+					"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 					"dev": true,
 					"requires": {
-						"has-flag": "2.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
@@ -5294,9 +5354,9 @@
 			}
 		},
 		"eslint-module-utils": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz",
-			"integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz",
+			"integrity": "sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=",
 			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
@@ -5346,21 +5406,21 @@
 			}
 		},
 		"eslint-plugin-import": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz",
-			"integrity": "sha512-Rf7dfKJxZ16QuTgVv1OYNxkZcsu/hULFnC+e+w0Gzi6jMC3guQoWQgxYxc54IDRinlb6/0v5z/PxxIKmVctN+g==",
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz",
+			"integrity": "sha1-Fa7qN6Z0mdhI6OmBgG1GJ7VQOBY=",
 			"dev": true,
 			"requires": {
-				"builtin-modules": "1.1.1",
 				"contains-path": "0.1.0",
 				"debug": "2.6.9",
 				"doctrine": "1.5.0",
 				"eslint-import-resolver-node": "0.3.2",
-				"eslint-module-utils": "2.1.1",
+				"eslint-module-utils": "2.2.0",
 				"has": "1.0.1",
-				"lodash.cond": "4.5.2",
+				"lodash": "4.17.5",
 				"minimatch": "3.0.4",
-				"read-pkg-up": "2.0.0"
+				"read-pkg-up": "2.0.0",
+				"resolve": "1.7.1"
 			},
 			"dependencies": {
 				"doctrine": {
@@ -5429,6 +5489,15 @@
 						"find-up": "2.1.0",
 						"read-pkg": "2.0.0"
 					}
+				},
+				"resolve": {
+					"version": "1.7.1",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",
+					"integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==",
+					"dev": true,
+					"requires": {
+						"path-parse": "1.0.5"
+					}
 				}
 			}
 		},
@@ -5467,9 +5536,9 @@
 			}
 		},
 		"eslint-plugin-react": {
-			"version": "7.6.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.6.1.tgz",
-			"integrity": "sha512-30aMOHWX/DOaaLJVBHz6RMvYM2qy5GH63+y2PLFdIrYe4YLtODFmT3N1YA7ZqUnaBweVbedr4K4cqxOlWAPjIw==",
+			"version": "7.7.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz",
+			"integrity": "sha512-KC7Snr4YsWZD5flu6A5c0AcIZidzW3Exbqp7OT67OaD2AppJtlBr/GuPrW/vaQM/yfZotEvKAdrxrO+v8vwYJA==",
 			"dev": true,
 			"requires": {
 				"doctrine": "2.1.0",
@@ -5501,13 +5570,21 @@
 			"dev": true
 		},
 		"espree": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz",
-			"integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==",
+			"version": "3.5.4",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+			"integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
 			"dev": true,
 			"requires": {
-				"acorn": "5.4.1",
+				"acorn": "5.5.3",
 				"acorn-jsx": "3.0.1"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.5.3",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz",
+					"integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==",
+					"dev": true
+				}
 			}
 		},
 		"esprima": {
@@ -5517,9 +5594,9 @@
 			"dev": true
 		},
 		"esquery": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-			"integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+			"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
 			"dev": true,
 			"requires": {
 				"estraverse": "4.2.0"
@@ -8354,9 +8431,9 @@
 			"dev": true
 		},
 		"is-path-in-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+			"integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
 			"dev": true,
 			"requires": {
 				"is-path-inside": "1.0.1"
@@ -10778,12 +10855,6 @@
 			"resolved": "https://registry.npmjs.org/lodash.compact/-/lodash.compact-3.0.1.tgz",
 			"integrity": "sha1-VAzjg3dFl1gHRx4WtKK6IeclbKU="
 		},
-		"lodash.cond": {
-			"version": "4.5.2",
-			"resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
-			"integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU=",
-			"dev": true
-		},
 		"lodash.create": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
@@ -14185,7 +14256,7 @@
 				"babel-runtime": "6.26.0",
 				"common-tags": "1.7.2",
 				"dlv": "1.1.1",
-				"eslint": "4.17.0",
+				"eslint": "4.19.1",
 				"indent-string": "3.2.0",
 				"lodash.merge": "4.6.1",
 				"loglevel-colored-level-prefix": "1.0.0",
@@ -14216,7 +14287,7 @@
 				"camelcase-keys": "4.2.0",
 				"chalk": "2.3.0",
 				"common-tags": "1.7.2",
-				"eslint": "4.17.0",
+				"eslint": "4.19.1",
 				"find-up": "2.1.0",
 				"get-stdin": "5.0.1",
 				"glob": "7.1.2",
@@ -15207,6 +15278,12 @@
 				"is-equal-shallow": "0.1.3"
 			}
 		},
+		"regexpp": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+			"integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+			"dev": true
+		},
 		"regexpu-core": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
@@ -16660,39 +16737,45 @@
 			"requires": {
 				"ajv": "5.5.2",
 				"ajv-keywords": "2.1.1",
-				"chalk": "2.3.0",
+				"chalk": "2.4.0",
 				"lodash": "4.17.5",
 				"slice-ansi": "1.0.0",
 				"string-width": "2.1.1"
 			},
 			"dependencies": {
 				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 					"dev": true,
 					"requires": {
 						"color-convert": "1.9.1"
 					}
 				},
 				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+					"version": "2.4.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz",
+					"integrity": "sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "3.2.0",
+						"ansi-styles": "3.2.1",
 						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
+						"supports-color": "5.4.0"
 					}
 				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+					"dev": true
+				},
 				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+					"version": "5.4.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+					"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
 					"dev": true,
 					"requires": {
-						"has-flag": "2.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
diff --git a/package.json b/package.json
index ae2d0785e5..2c2af9bba6 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
 		"async": "^2.0.0-rc.5",
 		"babel-cli": "^6.24.1",
 		"babel-core": "^6.26.0",
-		"babel-eslint": "^8.0.2",
+		"babel-eslint": "^8.2.3",
 		"babel-jest": "^20.0.3",
 		"babel-loader": "^7.1.1",
 		"babel-plugin-import-noop": "^1.0.1",
@@ -145,14 +145,14 @@
 		"css-loader": "^0.28.0",
 		"enzyme": "^2.5.1",
 		"enzyme-to-json": "^1.5.0",
-		"eslint": "^4.12.0",
+		"eslint": "^4.19.1",
 		"eslint-config-airbnb": "16.1.0",
 		"eslint-loader": "^1.6.0",
 		"eslint-plugin-filenames": "^1.2.0",
-		"eslint-plugin-import": "^2.2.0",
+		"eslint-plugin-import": "^2.11.0",
 		"eslint-plugin-json": "^1.2.0",
 		"eslint-plugin-jsx-a11y": "^6.0.3",
-		"eslint-plugin-react": "^7.1.0",
+		"eslint-plugin-react": "^7.7.0",
 		"express": "^4.15.5",
 		"file-loader": "^0.11.0",
 		"find-remove": "^1.1.0",