Merge branch 'assorted-fixes' into 'master'

AI: Only consider the "prevent all combat damage" pump KW useful in combat

See merge request core-developers/forge!497

forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java

@@ -450,6 +450,10 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     || card.isTapped() || newPower <= 0) {
                 return false;
             }
+        } else if (keyword.equals("Prevent all combat damage that would be dealt to CARDNAME.")) {
+            if (combat == null || !(combat.isBlocking(card) || combat.isBlocked(card))) {
+                return false;
+            }
         }
         return true;
     }