Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Enhancement Shaman.
Merge pull request #218 from nishikazuhiro/patch-20

Reflecting "haxxxx" recent 5.2 changes