Fixed nasty bug
Merge branch 'hotfix/3673'

Close #3673
Merge branch 'hotfix/mime-mishap' of git://github.com/RWOverdijk/zf2 into hotfix/3638
[#3638] Wrote test case

- Wrote unit test that failed before changes, passes afterwards
Merge branch 'hotfix/3638' into develop

Forward port #3638