Merge "Fix return type in fallback8bitEncoding() documentation block"