Fix Content-Type overriding.
Merge pull request #1956 from gergoerdosi/content-type

Fix Content-Type overriding
Merge branch 'master' into hotfixes_rSZ_rV