Merge pull request #17058 from cotequeiroz/gnutls