Reflecting "haxxxx" recent 5.2 changes

eflecting "haxxxx" recent 5.2 changes for Elemental Shaman.
Merge pull request #217 from nishikazuhiro/patch-19

Reflecting "haxxxx" recent 5.2 changes