Merge branch 'maint'

Conflicts:
	lisp/org.el

lisp/org.el

@@ -11663,7 +11663,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
 	       (setq it (or rfloc
 			    (let (heading-text)
 			      (save-excursion
-				(unless (or arg (listp arg))
+				(unless (and arg (listp arg))
 				  (org-back-to-heading t)
 				  (setq heading-text
 					(replace-regexp-in-string
@@ -11671,7 +11671,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
 					 "\\3"
 					 (nth 4 (org-heading-components)))))
 				(org-refile-get-location
-				 (cond ((or arg (listp arg)) "Goto")
+				 (cond ((and arg (listp arg)) "Goto")
 				       (regionp (concat actionmsg " region to"))
 				       (t (concat actionmsg " subtree \""
 						  heading-text "\" to")))