Merge branch 'main' into enh/revise-pixi-discussion

Author: lwasser

.all-contributorsrc

@@ -998,6 +998,16 @@
       "contributions": [
         "review"
       ]
+    },
+    {
+      "login": "matthewfeickert",
+      "name": "Matthew Feickert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5142394?v=4",
+      "profile": "http://www.matthewfeickert.com/",
+      "contributions": [
+        "doc",
+        "review"
+      ]
     }
   ],
   "contributorsPerLine": 7,