Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/Entities/Player/Player.h

src/server/shared/DataStores/DBCDatabaseLoader.cpp

@@ -122,7 +122,10 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
 
     // insert new records to index table
     for (uint32 i = 0; i < newRecords; ++i)
+    {
+        // cppcheck-suppress autoVariables
         indexTable[newIndexes[i]] = &dataTable[i * _recordSize];
+    }
 
     records = indexTableSize;