Merge branch 'master' into nsec3optout
Add optout tests to .travis.yml