Regexp used to more reliably remove charset string from content type
Merge remote-tracking branch 'origin/next' into next