Merge "modyllic patch" and "modyllic apply"
Merge pull request #244 from iarna/merge-apply-and-patch

Merge "modyllic patch" and "modyllic apply"