Code

changelog: The new upstream release also fixes #626124.