Merge pull request #2386 from TheBlueMatt/2023-06-macos-msrv