soc
Merge pull request #359 from smogon/3b507fafcc2dcc232ceeffe95d2a34cf

soc