mac26

i hope i am doing this right sandz why you sleep now z_z
Merge pull request #396 from smogon/4c3cbe55cdcea962f0d0e20cf4ff41be

mac26