Merge "Overload toHtml() & fromHtml() to accept option flags"