Fix issue with avoidance discs
Fix for Technique of Master Wu triple attack
Merge remote-tracking branch 'upstream/master' into Warning_Cleanup