Merge branch 'maint'

Conflicts:
	lisp/ox-latex.el

lisp/ox-latex.el

@@ -2361,8 +2361,8 @@ contextual information."
 		((and float (not (assoc "float" org-latex-listings-options)))
 		 `(("float" ,org-latex-default-figure-position))))
 	       `(("language" ,lst-lang))
-	       (when label `(("label" ,label)))
-	       (when caption-str `(("caption" ,caption-str)))
+	       (if label `(("label" ,label)) '(("label" " ")))
+	       (if caption-str `(("caption" ,caption-str)) '(("caption" " ")))
 	       (cond ((assoc "numbers" org-latex-listings-options) nil)
 		     ((not num-start) '(("numbers" "none")))
 		     ((zerop num-start) '(("numbers" "left")))