Merge branch 'master' into 'master'

A somewhat better logic for Chandra, Bold Pyromancer +1 ability so the AI doesn't miss opportunities to use it.

See merge request core-developers/forge!1121

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

@@ -31,6 +31,8 @@ public class ManaEffectAi extends SpellAbilityAi {
     protected boolean checkAiLogic(Player ai, SpellAbility sa, String aiLogic) {
         if ("ManaRitual".equals(aiLogic)) {
             return doManaRitualLogic(ai, sa);
+        } else if ("Always".equals(aiLogic)) {
+            return true;
         }
         return super.checkAiLogic(ai, sa, aiLogic);
     }