Break dependency cycles to charset/collation classes.
Merge remote-tracking branch 'origin/master'