Fixed #3282
Merge branch 'hotfix/3300'

Close #3300
Fixes #3299
Merge branch 'zf3282' of git://github.com/youngguns-nl/zf2 into hotfix/3302
[#3302] CS fixes

- Removed unnecessary extra lines
- Removed a docblock used for IDE typehinting
Merge branch 'hotfix/3302' into develop

Forward port #3302