Mentor Profile Fixes
Merge pull request #520 from smogon/9c171fc8446aed7a5a751524cfe94216

Mentor Profile Fixes