Merge pull request #1017 from LightAdept/master

New Arcanine
Merge remote-tracking branch 'origin/master'