Update Charset.class.php
Merge remote-tracking branch 'origin/DC2' into dev