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

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index fc06dca6355..bc58519fde4 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -880,8 +880,8 @@ class ScriptMgr
     public: /* Initialization */
         static ScriptMgr* instance()
         {
-            static ScriptMgr* instance = new ScriptMgr();
-            return instance;
+            static ScriptMgr instance;
+            return &instance;
         }
 
         void Initialize();
diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h
index 636343838c1..74c51e5b136 100644
--- a/src/server/game/Scripting/ScriptSystem.h
+++ b/src/server/game/Scripting/ScriptSystem.h
@@ -54,8 +54,8 @@ class SystemMgr
     public:
         static SystemMgr* instance()
         {
-            static SystemMgr* instance = new SystemMgr();
-            return instance;
+            static SystemMgr instance;
+            return &instance;
         }
 
         typedef std::unordered_map<uint32, ScriptPointVector> PointMoveMap;