Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Shadow Priest.
Merge pull request #216 from nishikazuhiro/patch-18

Reflecting "haxxxx" recent 5.2 changes