Merge branch 'master' of github.com:internetarchive/heritrix3
Merge branch 'master' into no-deferred-write