Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

config/webpack/rules/css.js

@@ -22,7 +22,6 @@ module.exports = {
       loader: 'sass-loader',
       options: {
         includePaths: ['app/javascript'],
-        fiber: require('fibers'),
         implementation: require('sass'),
         sourceMap: true,
       },