Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream's README got updated, but we have a completely different one.
  Kept ours.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge