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

Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/server/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h
index 31bbfa01900..c60f2942efd 100644
--- a/src/server/game/Handlers/AddonHandler.h
+++ b/src/server/game/Handlers/AddonHandler.h
@@ -28,8 +28,8 @@ class AddonHandler
     public:
         static AddonHandler* instance()
         {
-            static AddonHandler* instance = new AddonHandler();
-            return instance;
+            static AddonHandler instance;
+            return &instance;
         }
 
         bool BuildAddonPacket(WorldPacket* Source, WorldPacket* Target);