Upstream Commit [r6206]
Upstream commit
2932 - Fix handling of newlines in task descriptions (and elsewhere)
Upstream commit for "XSS fixes for Contacts module"