Merge "Support the underline and its attributes in span tag" into devel/master