Merge "Fix unicode in documentation generated from this code" into main