Merge branch 'maint'

lisp/ox-html.el

@@ -2093,7 +2093,7 @@ channel."
 CONTENTS is nil.  INFO is a plist holding contextual
 information."
   (format (or (cdr (assq 'code org-html-text-markup-alist)) "%s")
-	  (org-html-plain-text (org-element-property :value code) info)))
+	  (org-html-encode-plain-text (org-element-property :value code))))
 
 ;;;; Drawer
 
@@ -3225,7 +3225,7 @@ holding contextual information."
 CONTENTS is nil.  INFO is a plist holding contextual
 information."
   (format (or (cdr (assq 'verbatim org-html-text-markup-alist)) "%s")
-	  (org-html-plain-text (org-element-property :value verbatim) info)))
+	  (org-html-encode-plain-text (org-element-property :value verbatim))))
 
 ;;;; Verse Block