Merge branch 'spiffy-pr' of https://github.com/EvanDotPro/zf2 into ho…

…tfix/di_exception_messages

Conflicts:
	library/Zend/Di/Di.php

src/Di.php

@@ -167,7 +167,7 @@ public function newInstance($name, array $params = array(), $isShared = true)
 
         $instantiator     = $definitions->getInstantiator($class);
         $injectionMethods = $definitions->getMethods($class);
-
+        
         if ($instantiator === '__construct') {
             $object = $this->createInstanceViaConstructor($class, $params, $alias);
             if (array_key_exists('__construct', $injectionMethods)) {
@@ -183,9 +183,9 @@ public function newInstance($name, array $params = array(), $isShared = true)
                     isset($instantiator[1]) ? $instantiator[1] : 'NoMethodGiven'
                 );
             } else {
-                $msg = 'Invalid instantiator: ' . $instantiator;
+                $msg = 'Invalid instantiator';
             }
-            throw new \RuntimeException($msg);
+            throw new \RuntimeException($msg);  
         }
 
         if ($isShared) {