Merge remote-tracking branch 'upstream/master' into fix/annotaion_input

test/AclTest.php

@@ -1168,7 +1168,7 @@ public function testAclAssertionsGetOriginalIsAllowedObjects()
         $assertion->assertReturnValue = false;
         $this->assertFalse($acl->isAllowed($user, $blogPost, 'modify'), 'Assertion should return false');
 
-        // check to see if the last assertion has the proper objets
+        // check to see if the last assertion has the proper objects
         $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\User', $assertion->lastAssertRole, 'Assertion did not receive proper role object');
         $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\BlogPost', $assertion->lastAssertResource, 'Assertion did not receive proper resource object');