Minor improvements
Merge branch 'hotfix/3324'

Close #3324
Merge branch 'loop-improvements' of git://github.com/neeckeloo/zf2 into hotfix/3326
Merge branch 'hotfix/3326' into develop

Forward port #3326