Merge branch 'hotfix/ZF2-51' of https://github.com/postalservice14/zf2 …

…into feature/zf2-51

Conflicts:
	tests/Zend/Config/ConfigTest.php
	tests/Zend/Controller/Action/Helper/ActionStackTest.php
	tests/Zend/Controller/Router/RewriteTest.php
	tests/Zend/Controller/Router/Route/ChainTest.php
	tests/Zend/Controller/Router/Route/ModuleTest.php
	tests/Zend/Controller/Router/Route/RegexTest.php
	tests/Zend/Controller/Router/Route/StaticTest.php
	tests/Zend/Controller/Router/RouteTest.php
	tests/Zend/Db/Adapter/AbstractTest.php
	tests/Zend/Db/Adapter/PdoIbmTest.php
	tests/Zend/Db/Adapter/PdoMysqlTest.php
	tests/Zend/Db/Adapter/PdoSqliteTest.php
	tests/Zend/Db/Adapter/StaticTest.php
	tests/Zend/Db/Select/AbstractTest.php
	tests/Zend/Db/Statement/AbstractPdoTest.php
	tests/Zend/Db/Statement/AbstractTest.php
	tests/Zend/Db/Statement/MysqliTest.php
	tests/Zend/Http/CookieJarTest.php
	tests/Zend/Json/JsonTest.php
	tests/Zend/Loader/PluginLoaderTest.php

test/DbStatementTest.php

@@ -147,7 +147,7 @@ public function testFetchObject()
         $stmt->append($row);
 
         $object = $stmt->fetchObject();
-        $this->assertType('stdClass', $object);
+        $this->assertInternalType('object', $object);
         $this->assertEquals('bar', $object->foo);
         $this->assertEquals('baz', $object->bar);
     }