Changes for expanded (and improved) character_set handling.
Authored by: dwarren 2014-03-19
Parent: [r7933]
Child: [r7935]