Merge branch 'coremaster' into historicLDA

# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt

forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

@@ -396,9 +396,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
                     canChooseZero = false;
                 }
             }
-            if (ability.getHostCard().hasKeyword("Spend only colored mana on X. No more than one mana of each color may be spent this way.")) {
-                max = 5;
-            }
         }
         final int min = canChooseZero ? 0 : 1;