Fix for GitHub issue 2511
Merge branch 'hotfix/3342'

Close #3342
Merge branch 'zf2511' of git://github.com/nemekzg/zf2 into hotfix/3355
Merge branch 'hotfix/3355' into develop

Forward port #3355