Merge remote-tracking branch 'upstream/master'

config/webpack/loaders/babel.js

@@ -1,3 +1,5 @@
+const { resolve } = require('path');
+
 module.exports = {
   test: /\.js$/,
   // include react-intl because transform-react-remove-prop-types needs to apply to it
@@ -9,5 +11,6 @@ module.exports = {
   options: {
     forceEnv: process.env.NODE_ENV || 'development',
     sourceRoot: 'app/javascript',
+    cacheDirectory: resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'),
   },
 };