Merge branch 'origin-maint'

lisp/org-latex.el

@@ -2003,7 +2003,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
                              (if shortn (concat "[" shortn "]") "")
                              (or caption "")
 			     (if label (format "\\label{%s}" label) "")))
-			(if (and longtblp caption) "\\\\\n" "\n")
+			(if (and longtblp caption org-export-latex-table-caption-above)
+			    "\\\\\n" "\n")
                         (if (and org-export-latex-tables-centered (not longtblp))
                             "\\begin{center}\n")
                         (if (not longtblp)