Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Disc Priest.
Merge pull request #215 from nishikazuhiro/patch-17

Reflecting "haxxxx" recent 5.2 changes