Merge branch 'master' into master

Author: garygong

components/modal/__tests__/modal.browser-test.jsx

@@ -28,16 +28,10 @@ describe('SLDSModal: ', function () {
 		appNode = null;
 	});
 
-	afterEach((done) => {
-		// We run into a race condition if we do not have this wait
-		// with the changes to react-modal, we end up trying to set state
-		// on an unmounted component
-		setTimeout(() => {
-			ReactDOM.unmountComponentAtNode(container);
-			document.body.removeChild(container);
-			container = null;
-			done();
-		}, 100);
+	afterEach(() => {
+		ReactDOM.unmountComponentAtNode(container);
+		document.body.removeChild(container);
+		container = null;
 	});
 
 	const defaultProps = {