Merge pull request #866 from linquize/content-type-encoding