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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc package.json
index 71cab74ab0ba3dd9d2670802eb27165247d0c32e,75972be454a03796ca1a8986513f26d429c7bb27..d72c9b93dd218b29eac10f961bff33dcfaa75735
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -69,9 -68,8 +69,9 @@@
      "@babel/preset-react": "^7.7.4",
      "@babel/runtime": "^7.7.7",
      "@gamestdio/websocket": "^0.3.2",
-     "@clusterws/cws": "^0.16.1",
+     "@clusterws/cws": "^0.17.3",
      "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
      "autoprefixer": "^9.7.3",
      "axios": "^0.19.0",

diff --cc yarn.lock
Simple merge