Update local fork

merge TrinityCore:master into tkrokli:master