Megactl: integrate patch by Pat Suwalski (no enclosure)