diff --git a/.vscode/settings.json b/.vscode/settings.json
index aff885a4b5..8372f5e6df 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,7 +8,7 @@
     100
   ],
   "editor.tabSize": 2,
-  "files.exclude": {
+  "search.exclude": {
     "**/.git": true,
     "**/.svn": true,
     "**/.hg": true,
diff --git a/package.json b/package.json
index c0743344e8..b4aefe6e5e 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "gulp-sourcemaps": "^2.4.0",
     "intl": "^1.2.5",
     "json-loader": "^0.5.4",
-    "locale-loader": "^1.2.4",
+    "locale-loader": "^1.3.0",
     "node-sass": "^4.5.3",
     "postcss-loader": "^2.0.5",
     "react": "^15.4.1",
diff --git a/src/components/CallAlert/i18n/de-DE.js b/src/components/CallAlert/i18n/de-DE.js
index c13efa5e63..a9cb8a9d2b 100644
--- a/src/components/CallAlert/i18n/de-DE.js
+++ b/src/components/CallAlert/i18n/de-DE.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Herstellen der Verbindung aufgrund interner Fehler nicht möglich. Versuchen Sie es später erneut.',
   [callErrors.notAnExtension]: 'Die Durchwahlnummer existiert nicht.',
   [callErrors.networkError]: 'Herstellen der Verbindung aufgrund von Netzwerkproblemen nicht möglich. Versuchen Sie es später erneut.',
-  [callErrors.noRingoutEnable]: `Mit Ihrer Durchwahl können Anrufe mit Desktop-Apps getätigt werden.
-    Wenden Sie sich an Ihren Kontoadministrator für ein Upgrade,
-    wenn Sie zu anderen Anrufoptionen wechseln möchten.`,
+  [callErrors.noRingoutEnable]: 'Mit Ihrer Durchwahl können Anrufe mit Desktop-Apps getätigt werden.\n    Wenden Sie sich an Ihren Kontoadministrator für ein Upgrade,\n    wenn Sie zu anderen Anrufoptionen wechseln möchten.',
   areaCode: 'Vorwahl',
 };
diff --git a/src/components/CallAlert/i18n/en-CA.js b/src/components/CallAlert/i18n/en-CA.js
index 04bd4bf945..e6a562288d 100644
--- a/src/components/CallAlert/i18n/en-CA.js
+++ b/src/components/CallAlert/i18n/en-CA.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Cannot connect due to internal errors. Please try again later.',
   [callErrors.notAnExtension]: 'The extension number does not exist.',
   [callErrors.networkError]: 'Cannot connect due to network issues. Please try again later.',
-  [callErrors.noRingoutEnable]: `Your extension is allowed to make calls with desktop app.
-    If you wish to switch to other calling options
-    please contact your account administrator for an upgrade.`,
+  [callErrors.noRingoutEnable]: 'Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade.',
   areaCode: 'area code',
 };
diff --git a/src/components/CallAlert/i18n/en-GB.js b/src/components/CallAlert/i18n/en-GB.js
index 724290d3ab..955c24fb2a 100644
--- a/src/components/CallAlert/i18n/en-GB.js
+++ b/src/components/CallAlert/i18n/en-GB.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Cannot connect due to internal errors. Please try again later.',
   [callErrors.notAnExtension]: 'The extension number does not exist.',
   [callErrors.networkError]: 'Cannot connect due to network issues. Please try again later.',
-  [callErrors.noRingoutEnable]: `Your extension is allowed to make calls with desktop app.
-    If you wish to switch to other calling options,
-    please contact your account administrator for an upgrade.`,
+  [callErrors.noRingoutEnable]: 'Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options,\n    please contact your account administrator for an upgrade.',
   areaCode: 'area code',
 };
diff --git a/src/components/CallAlert/i18n/en-US.js b/src/components/CallAlert/i18n/en-US.js
index 04bd4bf945..e6a562288d 100644
--- a/src/components/CallAlert/i18n/en-US.js
+++ b/src/components/CallAlert/i18n/en-US.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Cannot connect due to internal errors. Please try again later.',
   [callErrors.notAnExtension]: 'The extension number does not exist.',
   [callErrors.networkError]: 'Cannot connect due to network issues. Please try again later.',
-  [callErrors.noRingoutEnable]: `Your extension is allowed to make calls with desktop app.
-    If you wish to switch to other calling options
-    please contact your account administrator for an upgrade.`,
+  [callErrors.noRingoutEnable]: 'Your extension is allowed to make calls with desktop app.\n    If you wish to switch to other calling options\n    please contact your account administrator for an upgrade.',
   areaCode: 'area code',
 };
diff --git a/src/components/CallAlert/i18n/es-419.js b/src/components/CallAlert/i18n/es-419.js
index 9e6761fe46..04f1b05336 100644
--- a/src/components/CallAlert/i18n/es-419.js
+++ b/src/components/CallAlert/i18n/es-419.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Se produjo un error en la conexión. Vuelva a intentarlo más tarde.',
   [callErrors.notAnExtension]: 'El número de extensión no existe.',
   [callErrors.networkError]: 'No se puede conectar debido a errores de la red. Vuelva a intentarlo más tarde.',
-  [callErrors.noRingoutEnable]: `Su extensión puede hacer llamadas con la aplicación de escritorio.
-    Si desea acceder a otras opciones
-    comuníquese con el administrador de su cuenta para la actualización.`,
+  [callErrors.noRingoutEnable]: 'Su extensión puede hacer llamadas con la aplicación de escritorio.\n    Si desea acceder a otras opciones\n    comuníquese con el administrador de su cuenta para la actualización.',
   areaCode: 'código de área',
 };
diff --git a/src/components/CallAlert/i18n/es-ES.js b/src/components/CallAlert/i18n/es-ES.js
index a66563c6fb..3bcff14003 100644
--- a/src/components/CallAlert/i18n/es-ES.js
+++ b/src/components/CallAlert/i18n/es-ES.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Se ha producido un fallo en la conexión. Vuelva a intentarlo más tarde.',
   [callErrors.notAnExtension]: 'El número de extensión no existe.',
   [callErrors.networkError]: 'No se puede conectar debido a errores de red. Vuelva a intentarlo más tarde.',
-  [callErrors.noRingoutEnable]: `Su extensión puede hacer llamadas con la app de escritorio.
-    Si desea acceder a otras opciones
-    póngase en contacto con el administrador de su cuenta para la actualización.`,
+  [callErrors.noRingoutEnable]: 'Su extensión puede hacer llamadas con la app de escritorio.\n    Si desea acceder a otras opciones\n    póngase en contacto con el administrador de su cuenta para la actualización.',
   areaCode: 'código de área',
 };
diff --git a/src/components/CallAlert/i18n/fr-CA.js b/src/components/CallAlert/i18n/fr-CA.js
index 08cc535380..fdee4985b5 100644
--- a/src/components/CallAlert/i18n/fr-CA.js
+++ b/src/components/CallAlert/i18n/fr-CA.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Connexion impossible en raison d\'erreurs internes. Veuillez réessayer plus tard.',
   [callErrors.notAnExtension]: 'Le numéro de poste n\'existe pas.',
   [callErrors.networkError]: 'Connexion impossible en raison de problèmes de réseau. Veuillez réessayer plus tard.',
-  [callErrors.noRingoutEnable]: `Votre poste est autorisé à effectuer des appels avec l'application pour ordinateur de bureau.
-    Si vous souhaitez passer à d'autres options d'appel,
-    veuillez communiquer avec votre administrateur de compte pour une mise à niveau.`,
+  [callErrors.noRingoutEnable]: 'Votre poste est autorisé à effectuer des appels avec l\'application pour ordinateur de bureau.\n    Si vous souhaitez passer à d\'autres options d\'appel,\n    veuillez communiquer avec votre administrateur de compte pour une mise à niveau.',
   areaCode: 'indicatif régional',
 };
diff --git a/src/components/CallAlert/i18n/fr-FR.js b/src/components/CallAlert/i18n/fr-FR.js
index 37dfd661c3..66aa2cf756 100644
--- a/src/components/CallAlert/i18n/fr-FR.js
+++ b/src/components/CallAlert/i18n/fr-FR.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Connexion impossible en raison d\'erreurs internes. Veuillez réessayer plus tard.',
   [callErrors.notAnExtension]: 'Le numéro de l\'extension n\'existe pas.',
   [callErrors.networkError]: 'Connexion impossible en raison de problèmes de réseau. Veuillez réessayer plus tard.',
-  [callErrors.noRingoutEnable]: `Votre extension est autorisée à passer des appels avec l'application pour ordinateur de bureau.
-    Si vous souhaitez passer à d'autres options d'appel,
-    veuillez contacter votre administrateur de compte pour une mise à niveau.`,
+  [callErrors.noRingoutEnable]: 'Votre extension est autorisée à passer des appels avec l\'application pour ordinateur de bureau.\n    Si vous souhaitez passer à d\'autres options d\'appel,\n    veuillez contacter votre administrateur de compte pour une mise à niveau.',
   areaCode: 'indicatif régional',
 };
diff --git a/src/components/CallAlert/i18n/it-IT.js b/src/components/CallAlert/i18n/it-IT.js
index c2d99fe281..551331b70f 100644
--- a/src/components/CallAlert/i18n/it-IT.js
+++ b/src/components/CallAlert/i18n/it-IT.js
@@ -8,8 +8,6 @@ export default {
   [callErrors.internalError]: 'Impossibile connettersi a causa di errori interni. Riprova più tardi.',
   [callErrors.notAnExtension]: 'Il numero interno non esiste.',
   [callErrors.networkError]: 'Impossibile connettersi a causa di problemi di rete. Riprova più tardi.',
-  [callErrors.noRingoutEnable]: `Dal tuo interno è possibile effettuare chiamate con l'app per il desktop.
-    Per passare ad altre opzioni di chiamata
-    contatta l'amministratore dell'account per un aggiornamento.`,
+  [callErrors.noRingoutEnable]: 'Dal tuo interno è possibile effettuare chiamate con l\'app per il desktop.\n    Per passare ad altre opzioni di chiamata\n    contatta l\'amministratore dell\'account per un aggiornamento.',
   areaCode: 'prefisso',
 };
diff --git a/src/components/ConferencePanel/i18n/en-US.js b/src/components/ConferencePanel/i18n/en-US.js
index c8307affac..2b1e03e165 100644
--- a/src/components/ConferencePanel/i18n/en-US.js
+++ b/src/components/ConferencePanel/i18n/en-US.js
@@ -7,10 +7,5 @@ export default {
   internationalNumbersHeader: 'Select International Dial-in Numbers',
   search: 'Search...',
   inviteWithText: 'Invite with Text',
-  inviteText: 'Please join the RingCentral conference.\n\n' +
-               'Dial-In Numbers: {dialInNumber} \n\n' +
-               '{internationals} \n' +
-               'Participant Access: {participantCode} \n\n' +
-               'Need an international dial-in phone number? Please visit http://www.ringcentral.com/conferencing \n\n' +
-               'This conference call is brought to you by RingCentral Conferencing.'
+  inviteText: 'Please join the RingCentral conference.\n\nDial-In Numbers: {dialInNumber} \n\n{internationals} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit http://www.ringcentral.com/conferencing \n\nThis conference call is brought to you by RingCentral Conferencing.'
 };
diff --git a/src/components/RegionSettingsAlert/i18n/de-DE.js b/src/components/RegionSettingsAlert/i18n/de-DE.js
index 33fb1214b7..714041082b 100644
--- a/src/components/RegionSettingsAlert/i18n/de-DE.js
+++ b/src/components/RegionSettingsAlert/i18n/de-DE.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Region',
   [regionSettingsMessages.saveSuccess]: 'Einstellungen wurden erfolgreich gespeichert.',
-  [regionSettingsMessages.dialingPlansChanged]: `Die vorherige Region wird für Ihr Konto nicht mehr unterstützt.
-    Prüfen Sie Ihre neuen {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'Die vorherige Region wird für Ihr Konto nicht mehr unterstützt.\n    Prüfen Sie Ihre neuen {regionSettingsLink}.',
   regionSettings: 'Regionseinstellungen',
   [regionSettingsMessages.areaCodeInvalid]: 'Geben Sie eine gültige Vorwahl ein.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/en-CA.js b/src/components/RegionSettingsAlert/i18n/en-CA.js
index 0a09c0caf7..9c99f8fa8f 100644
--- a/src/components/RegionSettingsAlert/i18n/en-CA.js
+++ b/src/components/RegionSettingsAlert/i18n/en-CA.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Region',
   [regionSettingsMessages.saveSuccess]: 'Settings saved successfully.',
-  [regionSettingsMessages.dialingPlansChanged]: `The previous region is no longer supported for your account.
-    Please verify your new {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'The previous region is no longer supported for your account.\n    Please verify your new {regionSettingsLink}.',
   regionSettings: 'region settings',
   [regionSettingsMessages.areaCodeInvalid]: 'Please enter a valid area code.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/en-GB.js b/src/components/RegionSettingsAlert/i18n/en-GB.js
index 0a09c0caf7..9c99f8fa8f 100644
--- a/src/components/RegionSettingsAlert/i18n/en-GB.js
+++ b/src/components/RegionSettingsAlert/i18n/en-GB.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Region',
   [regionSettingsMessages.saveSuccess]: 'Settings saved successfully.',
-  [regionSettingsMessages.dialingPlansChanged]: `The previous region is no longer supported for your account.
-    Please verify your new {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'The previous region is no longer supported for your account.\n    Please verify your new {regionSettingsLink}.',
   regionSettings: 'region settings',
   [regionSettingsMessages.areaCodeInvalid]: 'Please enter a valid area code.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/en-US.js b/src/components/RegionSettingsAlert/i18n/en-US.js
index 4540dc5c8b..9c99f8fa8f 100644
--- a/src/components/RegionSettingsAlert/i18n/en-US.js
+++ b/src/components/RegionSettingsAlert/i18n/en-US.js
@@ -4,9 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Region',
   [regionSettingsMessages.saveSuccess]: 'Settings saved successfully.',
-  [regionSettingsMessages.dialingPlansChanged]:
-    `The previous region is no longer supported for your account.
-    Please verify your new {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'The previous region is no longer supported for your account.\n    Please verify your new {regionSettingsLink}.',
   regionSettings: 'region settings',
   [regionSettingsMessages.areaCodeInvalid]: 'Please enter a valid area code.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/es-419.js b/src/components/RegionSettingsAlert/i18n/es-419.js
index d850f80fa0..888055503a 100644
--- a/src/components/RegionSettingsAlert/i18n/es-419.js
+++ b/src/components/RegionSettingsAlert/i18n/es-419.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Región',
   [regionSettingsMessages.saveSuccess]: 'La configuración se guardó correctamente.',
-  [regionSettingsMessages.dialingPlansChanged]: `Su cuenta ya no se admite para su cuenta.
-    Verifique su nueva {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'Su cuenta ya no se admite para su cuenta.\n    Verifique su nueva {regionSettingsLink}.',
   regionSettings: 'configuración de región',
   [regionSettingsMessages.areaCodeInvalid]: 'Ingrese un código de área válido.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/es-ES.js b/src/components/RegionSettingsAlert/i18n/es-ES.js
index 574b9c923c..d15583c5ce 100644
--- a/src/components/RegionSettingsAlert/i18n/es-ES.js
+++ b/src/components/RegionSettingsAlert/i18n/es-ES.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Región',
   [regionSettingsMessages.saveSuccess]: 'La configuración se guardó correctamente.',
-  [regionSettingsMessages.dialingPlansChanged]: `Su cuenta ya no es compatible con la región anterior.
-    Compruebe su nueva {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'Su cuenta ya no es compatible con la región anterior.\n    Compruebe su nueva {regionSettingsLink}.',
   regionSettings: 'configuración de región',
   [regionSettingsMessages.areaCodeInvalid]: 'Introduzca un código de área válido.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/fr-CA.js b/src/components/RegionSettingsAlert/i18n/fr-CA.js
index d51b97ba23..d53118cb1b 100644
--- a/src/components/RegionSettingsAlert/i18n/fr-CA.js
+++ b/src/components/RegionSettingsAlert/i18n/fr-CA.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Région',
   [regionSettingsMessages.saveSuccess]: 'Les paramètres ont été enregistrés.',
-  [regionSettingsMessages.dialingPlansChanged]: `La région précédente n'est plus prise en charge pour votre compte.
-     Veuillez vérifier vos nouveaux {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'La région précédente n\'est plus prise en charge pour votre compte.\n     Veuillez vérifier vos nouveaux {regionSettingsLink}.',
   regionSettings: 'paramètres régionaux',
   [regionSettingsMessages.areaCodeInvalid]: 'Veuillez entrer un indicatif régional valide.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/fr-FR.js b/src/components/RegionSettingsAlert/i18n/fr-FR.js
index 372436ebb7..265d57c8fd 100644
--- a/src/components/RegionSettingsAlert/i18n/fr-FR.js
+++ b/src/components/RegionSettingsAlert/i18n/fr-FR.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Région',
   [regionSettingsMessages.saveSuccess]: 'Les paramètres ont été enregistrés.',
-  [regionSettingsMessages.dialingPlansChanged]: `La région précédente n'est plus prise en charge pour votre compte.
-     Veuillez vérifier vos nouveaux {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'La région précédente n\'est plus prise en charge pour votre compte.\n     Veuillez vérifier vos nouveaux {regionSettingsLink}.',
   regionSettings: 'paramètres régionaux',
   [regionSettingsMessages.areaCodeInvalid]: 'Veuillez saisir un indicatif régional valide.',
 };
diff --git a/src/components/RegionSettingsAlert/i18n/it-IT.js b/src/components/RegionSettingsAlert/i18n/it-IT.js
index 544a2ffd92..c3e1695e5b 100644
--- a/src/components/RegionSettingsAlert/i18n/it-IT.js
+++ b/src/components/RegionSettingsAlert/i18n/it-IT.js
@@ -4,8 +4,7 @@ import regionSettingsMessages from
 export default {
   region: 'Regione',
   [regionSettingsMessages.saveSuccess]: 'Impostazioni salvate correttamente.',
-  [regionSettingsMessages.dialingPlansChanged]: `La regione precedente non è più supportata per l'account.
-    Verifica la nuova {regionSettingsLink}.`,
+  [regionSettingsMessages.dialingPlansChanged]: 'La regione precedente non è più supportata per l\'account.\n    Verifica la nuova {regionSettingsLink}.',
   regionSettings: 'impostazioni regione',
   [regionSettingsMessages.areaCodeInvalid]: 'Inserisci un prefisso valido.',
 };
diff --git a/yarn.lock b/yarn.lock
index 18754b4e29..3183fa6080 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1968,10 +1968,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-dedent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb"
-
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -2321,7 +2317,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@1.8.x, escodegen@1.x.x:
+escodegen@1.8.x, escodegen@1.x.x, escodegen@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2850,14 +2846,6 @@ fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
-fs-extra@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-
 fs-extra@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
@@ -2865,15 +2853,6 @@ fs-extra@^2.0.0:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
 
-fs-promise@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-1.0.0.tgz#4246a4cd45497d2ed57e6e4b22167d3864b23679"
-  dependencies:
-    any-promise "^1.0.0"
-    fs-extra "^1.0.0"
-    mz "^2.3.1"
-    thenify-all "^1.6.0"
-
 fs-promise@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-2.0.3.tgz#f64e4f854bcf689aa8bddcba268916db3db46854"
@@ -3143,7 +3122,7 @@ glogg@^1.0.0:
   dependencies:
     sparkles "^1.0.0"
 
-graceful-fs@4.X, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@4.X, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -3991,12 +3970,6 @@ kind-of@^4.0.0:
   dependencies:
     is-buffer "^1.1.5"
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 lazy-cache@^0.2.3:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
@@ -4076,13 +4049,13 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.x:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-locale-loader@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/locale-loader/-/locale-loader-1.2.4.tgz#19167e066d3e6d9ef3038f31230b1c35263d7ce4"
+locale-loader@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/locale-loader/-/locale-loader-1.3.0.tgz#509aa431ff74f2bc1c30c9e85ab9b8359c9e0074"
   dependencies:
     babylon "^6.16.1"
-    dedent "^0.6.0"
-    fs-promise "^1.0.0"
+    escodegen "^1.8.1"
+    fs-promise "^2.0.3"
     glob "^7.1.1"
     mkdirp-promise "^5.0.1"
     through2 "^2.0.3"
@@ -4566,7 +4539,7 @@ mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
-mz@^2.3.1, mz@^2.6.0:
+mz@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mz/-/mz-2.6.0.tgz#c8b8521d958df0a4f2768025db69c719ee4ef1ce"
   dependencies: