7 Years Ago
Merging in Character reference cleanup branch