upstream/20250102

Simon Josefsson

@jas

2da5a78b · autoupdate · Jan 01, 2025

Imported branch stable-202501 of upstream 20250102