*Merge.

--HG--
branch : trunk

src/game/PetHandler.cpp

@@ -82,13 +82,15 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
             switch(spellid)
             {
                 case COMMAND_STAY:                          //flat=1792  //STAY
+                    pet->AttackStop();
+                    pet->InterruptNonMeleeSpells(false);
                     pet->StopMoving();
-                    pet->GetMotionMaster()->Clear();
                     pet->GetMotionMaster()->MoveIdle();
                     charmInfo->SetCommandState( COMMAND_STAY );
                     break;
                 case COMMAND_FOLLOW:                        //spellid=1792  //FOLLOW
                     pet->AttackStop();
+                    pet->InterruptNonMeleeSpells(false);
                     pet->GetMotionMaster()->MoveFollow(_player,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE);
                     charmInfo->SetCommandState( COMMAND_FOLLOW );
                     break;