Merge remote-tracking branch 'origin/master' into gc-v2

Author: CertainLach

.github/FUNDING.yml

@@ -2,8 +2,8 @@
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: 0lach # Replace with a single Ko-fi username
+open_collective: jrsonnet
+ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username