Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid torgzip.c change, since torgzip has been replaced.