Bug 899070 - wrapTextIntoSafeHTMLString should really return a safe html string. r=asuth
Merge branch 'v1-train' into v1.1.0hd