Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle

backup/util/plan/tests/step_test.php

@@ -132,6 +132,9 @@ class backup_step_testcase extends advanced_testcase {
 
         // Remove the test dir and any content
         @remove_dir(dirname($file));
+
+        // Clear the time limit, otherwise PHPUnit complains.
+        set_time_limit(0);
     }
 
     /**