stuff
Merge pull request #323 from smogon/b6744ae82c01ca75e999b1d5664460f5

stuff