Core/Spells: Fixed fishing broken in a recent commit
Merge branch 'upstream/master'