7 Years Ago
Merge minor Character cleanup to trunk