Issue
Merge branch 'hotfix/3415'

Close #3415
Merge branch 'zf3348' of git://github.com/Deserved/zf2 into hotfix/3348
[#3348] Fix CS issues

- Trailing whitespace
Merge branch 'hotfix/3348' into develop

Forward port #3423