Merge "Fix return type for html strings"