Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Protection Paladin.
Merge pull request #213 from nishikazuhiro/patch-15

Reflecting "haxxxx" recent 5.2 changes