Merge https://github.com/cmangos/mangos-classic into develop
Merge branch 'develop' of https://github.com/blueboy/portalclassic into develop