Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Resto Shaman.
Merge pull request #219 from nishikazuhiro/patch-21

Reflecting "haxxxx" recent 5.2 changes