Merge branch 'master' into develop

Mage/Command/BuiltIn/DeployCommand.php

@@ -211,7 +211,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
         if (self::$failedTasks === 0) {
             $exitCode = 0;
         }
-
+        
+        if (self::$deployStatus === self::FAILED) {
+            $exitCode = 1;
+        }
+        
         return $exitCode;
     }
 

Mage/Task/Factory.php

@@ -59,7 +59,7 @@ class Factory
 
         $instance = new $className($taskConfig, $inRollback, $stage, $taskParameters);
 
-        if (!is_a($instance, 'Mage\Task\AbstractTask')) {
+        if (!($instance instanceof AbstractTask)) {
             throw new Exception('The Task ' . $taskName . ' must be an instance of Mage\Task\AbstractTask.');
         }