Merge branch 'maint' into master

lisp/org.el

@@ -6352,8 +6352,7 @@ Use `\\[org-edit-special]' to edit table.el tables"))
 				 (= (line-beginning-position)
 				    (org-element-property :post-affiliated
 							  item)))))
-		     (save-excursion (beginning-of-line 1)
-				     (looking-at org-outline-regexp)))
+		     (org-match-line org-outline-regexp))
 		 (or (bolp) (not (eq org-cycle-emulate-tab 'exc-hl-bol))))
 	    (org-cycle-internal-local))
 	   ;; From there: TAB emulation and template completion.