Merge branch 'gnutls' into v2