Merge branch 'master' into hotfix/ZF-3821

Conflicts:
	tests/Zend/InfoCard/XmlParsingTest.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);
     }