Merge branch 'master' of github.com:cmangos/mangos-wotlk into 'master'