Merge branch 'maint'

lisp/org.el

@@ -17986,7 +17986,10 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
 	    (setq org-drawers-for-agenda
 		  (append org-drawers-for-agenda org-drawers))
 	    (setq org-tag-alist-for-agenda
-		  (org-uniquify (append org-tag-alist-for-agenda org-tag-alist)))
+		  (org-uniquify
+		   (append org-tag-alist-for-agenda
+			   org-tag-alist
+			   org-tag-persistent-alist)))
 	    (if org-group-tags
 		(setq org-tag-groups-alist-for-agenda
 		      (org-uniquify-alist