Merge "amazonsoho: escape underscore to fix italics"