Convert htmlentities in OCR to prevent tags from accidentally forming.
Merge branch 'release-2.3'