Merge remote-tracking branch 'anisse/fix-content-encoding-charset'