Merge remote-tracking branch 'origin/master'

Mage.Sets/src/mage/cards/r/RumblingRuin.java

@@ -47,7 +47,8 @@ class RumblingRuinEffect extends OneShotEffect {
 
     RumblingRuinEffect() {
         super(Outcome.Benefit);
-        staticText = "";
+        staticText = "count the number of +1/+1 counters on creatures you control. " +
+                "Creatures your opponents control with power less than or equal to that number can't block this turn.";
     }
 
     private RumblingRuinEffect(final RumblingRuinEffect effect) {

Mage.Tests/src/test/java/org/mage/test/cards/copy/CopyCreatureCardToTokenImplTest.java

@@ -7,6 +7,7 @@ package org.mage.test.cards.copy;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -23,6 +24,7 @@ public class CopyCreatureCardToTokenImplTest extends CardTestPlayerBase {
      * either.
      */
     @Test
+    @Ignore
     public void testTokenTriggeresETBEffect() {
         // Flying
         // Sphinx spells you cast cost {2} less to cast.

Mage.Tests/src/test/java/org/mage/test/cards/single/avr/CavernOfSoulsTest.java

@@ -2,6 +2,7 @@ package org.mage.test.cards.single.avr;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -197,6 +198,7 @@ public class CavernOfSoulsTest extends CardTestPlayerBase {
      *
      */
     @Test
+    @Ignore
     public void testCastWithColorlessManaCanBeCountered() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
         addCard(Zone.HAND, playerA, "Cavern of Souls");

Mage/src/main/java/mage/abilities/AbilityImpl.java

@@ -119,6 +119,7 @@ public abstract class AbilityImpl implements Ability {
         this.sourceObjectZoneChangeCounter = ability.sourceObjectZoneChangeCounter;
         this.canFizzle = ability.canFizzle;
         this.targetAdjuster = ability.targetAdjuster;
+        this.costAdjuster = ability.costAdjuster;
     }
 
     @Override

Mage/src/main/java/mage/game/stack/StackAbility.java

@@ -70,6 +70,7 @@ public class StackAbility extends StackObjImpl implements Ability {
         this.expansionSetCode = stackAbility.expansionSetCode;
         this.targetAdjuster = stackAbility.targetAdjuster;
         this.targetChanged = stackAbility.targetChanged;
+        this.costAdjuster = stackAbility.costAdjuster;
     }
 
     @Override