Merge branch 'ye/http-extract-charset'