Merge pull request #6755 from EvanTheB/modemaster