Merge branch 'master' of https://github.com/cmangos/mangos-classic