Merge branch 'hotfix/3513'

Close #3513
Merge remote-tracking branch 'zf2/develop' into develop