Merge branch 'maint'

Conflicts:
	lisp/org-agenda.el

lisp/org-agenda.el

@@ -6035,7 +6035,7 @@ See also the user option `org-agenda-clock-consistency-checks'."
 				 (or (eq org-agenda-use-tag-inheritance t)
 				     (memq 'agenda org-agenda-use-tag-inheritance))))
 			tags (org-get-tags-at pos1 (not inherited-tags)))
-		  (setq head (buffer-substring-no-properties
+		  (setq head (buffer-substring
 			      (point)
 			      (progn (skip-chars-forward "^\r\n")
 				     (point))))
@@ -6175,7 +6175,7 @@ FRACTION is what fraction of the head-warning time has passed."
 
 		      tags (org-get-tags-at nil (not inherited-tags)))
 		(setq level (make-string (org-reduced-level (org-outline-level)) ? ))
-		(setq head (buffer-substring-no-properties
+		(setq head (buffer-substring
 			    (point)
 			    (progn (skip-chars-forward "^\r\n") (point))))
 		(if (string-match " \\([012]?[0-9]:[0-9][0-9]\\)" s)