Reflecting "haxxxx" recent 5.2 changes

Reflecting "haxxxx" recent 5.2 changes for Guardian Druid.
Merge pull request #210 from nishikazuhiro/patch-12

Reflecting "haxxxx" recent 5.2 changes