Improved WitchDoctor use of Harvest/Horrify and CombatMovement
Merge remote-tracking branch 'remotes/Master/master'