Merge Zend lib from upstream
 Please enter the commit message for your changes. Lines starting