Nidoranmale (whoops!)
Merge remote-tracking branch 'origin/master'
Merge pull request #1018 from LightAdept/master

NidoranMale (my bad)