Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Ret Paladin.
Merge pull request #214 from nishikazuhiro/patch-16

Reflecting "haxxxx" recent 5.2 changes