Merge r25248 to 1.12 release branch

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25249 44c647ce-9c0f-0410-b52a-842ac1e357ba
Merge r25250 to 1.12 release branch

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25251 44c647ce-9c0f-0410-b52a-842ac1e357ba