Symfony to Zend transfer v1.2
Merge origin/master