Merge branch 'gnutls' into ipv6