Merge branch 'master' into dnssec