Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
Core/Spells: Fix Cheat Death formula
Merge pull request #12069 from Trisjdc/cheat_death

Core/Spells: Fix Cheat Death formula
Merge pull request #11739 from Golrag/master

Core/Spells: Fixed Shadowstep taking the caster out of combat while it shouldn't
Merge remote-tracking branch 'upstream/master'