Successfully updated to ZF 2.1!
Merge branch 'feature/zf-2.1.1' into develop

Updated to ZF 2.1