Minor improvements
Merge branch 'loop-improvements' of git://github.com/neeckeloo/zf2 into hotfix/3326
Merge branch 'hotfix/3326'

Close #3326