Merge branch 'maint'

Conflicts:
	lisp/org.el

diff --cc lisp/org.el
index 3984fc3,bdbba86..a1b6692
--- 1/lisp/org.el
--- 2/lisp/org.el
+++ b/lisp/org.el
@@@ -135,20 -133,6 +135,20 @@@ Stars are put in group 1 and the trimme
  (declare-function org-table-maybe-eval-formula "org-table" ())
  (declare-function org-table-maybe-recalculate-line "org-table" ())
  
 +(autoload 'org-element-at-point "org-element")
++(autoload 'org-element-type "org-element")
 +
 +(declare-function org-element-at-point "org-element" (&optional keep-trail))
 +(declare-function org-element-type "org-element" (element))
 +(declare-function org-element-context "org-element" ())
 +(declare-function org-element-contents "org-element" (element))
 +(declare-function org-element-property "org-element" (property element))
- (declare-function org-element-paragraph-parser "org-element" (limit))
 +(declare-function org-element-map "org-element" (data types fun &optional info first-match no-recursion))
 +(declare-function org-element-nested-p "org-element" (elem-a elem-b))
 +(declare-function org-element-swap-A-B "org-element" (elem-a elem-b))
 +(declare-function org-element--parse-objects "org-element" (beg end acc restriction))
 +(declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only))
 +
  ;; load languages based on value of `org-babel-load-languages'
  (defvar org-babel-load-languages)