Support overriding content type via explicit header.
Merge pull request #1028 from square/jw/content-type-override

Support overriding content type via explicit header.