Merge commit 'origin/master' into 310

Conflicts:
	src/game/Player.cpp
	src/game/SpellAuras.cpp

src/game/SpellEffects.cpp

@@ -4042,6 +4042,8 @@ void Spell::EffectTameCreature(uint32 /*i*/)
     finish();
 
     Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id);
+    if(!pet)                                                // in versy specific state like near world end/etc.
+        return;
 
     // kill original creature
     creatureTarget->setDeathState(JUST_DIED);