Fix for GitHub issue 3469
Fix for GitHub issue 3469 - part 2
Merge branch 'hotfix/3683'

Close #3683
Fixes #3678
Merge branch 'zf3469' of git://github.com/nemekzg/zf2 into hotfix/3691
Merge branch 'hotfix/3691' into develop

Forward port #3691