Merge "Fix for underlined text." into devel/master