de37d75871
- Forwardport @jpinner's pull request #522 - Use Charset instead of charset name
- Forwardport @jpinner's pull request #522 - Use Charset instead of charset name