fix for issue #3685
PR #4019
Merge branch 'antonycox-master'
PR #4022
Merge branch 'hotfix/3685' of git://github.com/wryck7/zf2 into wryck7-hotfix/3685
Forward #4022
Merge branch 'wryck7-hotfix/3685' into develop