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/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h
index 47801f3ce19..add00ec7feb 100644
--- a/src/server/game/Accounts/AccountMgr.h
+++ b/src/server/game/Accounts/AccountMgr.h
@@ -58,8 +58,8 @@ class AccountMgr
     public:
         static AccountMgr* instance()
         {
-            static AccountMgr* instance = new AccountMgr();
-            return instance;
+            static AccountMgr instance;
+            return &instance;
         }
 
         AccountOpResult CreateAccount(std::string username, std::string password, std::string email = "");