Ovalord
3d0cb79d02
Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts:
# sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql
# sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql
# sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql
# sql/updates/world/4.3.4/2017_12_27_00_world.sql
# sql/updates/world/4.3.4/2017_12_27_01_world.sql
# sql/updates/world/4.3.4/2017_12_27_02_world.sql
# sql/updates/world/4.3.4/custom_2017_12_19_00_world.sql
# sql/updates/world/4.3.4/custom_2017_12_19_05_world.sql
# sql/updates/world/4.3.4/custom_2017_12_22_01_world.sql