Add function dolEscapeXML
Merge remote-tracking branch 'Upstream/develop' into develop-usercolor