Carry over replaceXMLEntities
Merge branch 'boinxtv1'