Merge branch 'master' into custom-exception
Merge branch 'master' of https://github.com/zf-fr/zfr-rest