[sd2_mr0635] Merge pull request #235 from Ulduar/pullrequest

PreSindragosa_Event