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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp

src/server/game/Grids/ObjectGridLoader.cpp

@@ -218,8 +218,7 @@ void ObjectGridStoper::Visit(CreatureMapType &m)
         {
             iter->GetSource()->CombatStop();
             iter->GetSource()->DeleteThreatList();
-            if (iter->GetSource()->IsAIEnabled)
-                iter->GetSource()->AI()->EnterEvadeMode();
+            iter->GetSource()->AI()->EnterEvadeMode();
         }
     }
 }