Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/scripts/Commands/cs_misc.cpp

src/server/game/Spells/SpellEffects.cpp

@@ -4785,6 +4785,7 @@ void Spell::EffectResurrectPet(SpellEffIndex /*effIndex*/)
         hadPet = false;
     }
 
+    // TODO: Better to fail Hunter's "Revive Pet" at cast instead of here when casting ends
     Pet* pet = player->GetPet(); // Attempt to get current pet
     if (!pet || pet->IsAlive())
         return;