Merge pull request #822 from AlienWiiBF/EVO_Mag_Test