Upgrade to Zend Framework 2.1.1