Merge branch 'tmp-buildfixes' into 'master'

Maintainer fixes

See merge request gnutls/libtasn1!84