Scripts/HoR: Some fixups.
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into ghbb