Merge from upstream #8

Merged
NotAlexNoyle merged 2 commits from master into master 2025-06-18 12:49:21 -04:00