Merge branch 'master' of https://github.com/zendframework/zf2
Merge branch 'master' of https://github.com/ze-pequeno/zf2