mac27
Merge pull request #397 from smogon/fc83b27164c1a4e3f6c9b37c850cc5be

mac27