soc
Merge pull request #358 from smogon/14f0fa0c283764950607b61bcd2b4cf2

soc