Merge master into ctmayn/mdx-markdown-support - resolve conflicts

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: Frossted

.github/workflows/ci.yml

@@ -25,8 +25,7 @@ jobs:
         with:
           fetch-depth: 10
 
-      - uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1
-      - uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1
+      - uses: ruby/setup-ruby@8e41b362d2589a22a44c1cfa214b3c83052c195b # v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true