Merged commits from MaNGOS

https://github.com/eluna-dev-mangos/ElunaCoreWotlk/commit/9398e934fa2ac3f1fd712935d8768e73eec37c5f

https://github.com/eluna-dev-mangos/ElunaCoreWotlk/commit/ca3dbed96d4db8ec32bf7622b003d1f516d21391