Makefile: Add extract target, fix option
Merge branch 'master' into orig.org
Merge branch 'orig.org' into edit.hybrid