Merge pull request #15251 from ja-pa/gnutls-3.7.1