fix for #3373
Making sure this branch isn't behind master

Merge remote-tracking branch 'zf2/master' into fix#3373
Merge branch 'hotfix/4119'

Close #4119
Merge pull request #4123 from bartmcleod/fix#3373

Fix#3373
[#4123] CS fixes

- EOF ending
Merge branch 'hotfix/4123' into develop

Forward port #4123