Merge branch 'master' of orgmode.org:org-mode

lisp/org-agenda.el

@@ -4907,7 +4907,7 @@ holidy will also be skipped."
 	 (progn
 	   (require 'cal-iso)
 	   (not (member (car (calendar-iso-from-absolute d)) skip-weeks))))
-     (not (and (memq `holidays' skip-weeks)
+     (not (and (memq 'holidays skip-weeks)
 	       (calendar-check-holidays date)))
      entry)))
 

lisp/org.el

@@ -12698,6 +12698,7 @@ only lines with a TODO keyword are included in the output."
 		      'mouse-face 'highlight
 		      'org-not-done-regexp org-not-done-regexp
 		      'org-todo-regexp org-todo-regexp
+		      'org-complex-heading-regexp org-complex-heading-regexp
 		      'help-echo
 		      (format "mouse-2 or RET jump to org file %s"
 			      (abbreviate-file-name