Merge https://github.com/TrinityCore/TrinityCore into 6.0.3

Conflicts:
	src/server/scripts/Spells/spell_dk.cpp