patch #6959 - dcXmpEscape2.patch