override default Content-Type and Accept headers if user wishes to
fix mimetypes tests
Merge branch 'unicode'
Merge remote-tracking branch 'upstream/master'