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

Conflicts:
	src/server/game/World/World.h

src/server/game/Entities/Unit/Unit.cpp

@@ -13670,7 +13670,10 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
         {
             Loot* loot = &creature->loot;
             if (creature->lootForPickPocketed)
+            {
+                creature->ResetPickPocketRefillTimer();
                 creature->lootForPickPocketed = false;
+            }
 
             loot->clear();
             if (uint32 lootid = creature->GetCreatureTemplate()->lootid)