Reflecting "haxxxx" recent 5.2 changes

flecting "haxxxx" recent 5.2 changes for Restoration Druid.
Merge pull request #211 from nishikazuhiro/patch-13

Reflecting "haxxxx" recent 5.2 changes