Merge pull request #3174 from Ham22/gnutls-trousers