ok
Merge branch 'master' of https://github.com/jansanchez/zf2 into local-jan
chaplin v0.8