Merge branch 'maint'

diff --cc lisp/org-agenda.el
Simple merge

diff --cc lisp/org-clock.el
index c4cca8b,c043dd1..914f5ff
--- 1/lisp/org-clock.el
--- 2/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@@ -220,9 -203,9 +220,9 @@@ file name  Play this sound file, fall b
    :type '(choice
          (const :tag "No sound" nil)
          (const :tag "Standard beep" t)
 -        (file :tag "Play sound file")))
 +        (file  :tag "Play sound file")))
  
- (org-define-obsolete-variable-alias 'org-clock-modeline-total
+ (define-obsolete-variable-alias 'org-clock-modeline-total
    'org-clock-mode-line-total "24.3")
  
  (defcustom org-clock-mode-line-total 'auto

diff --cc lisp/org-compat.el
Simple merge

diff --cc lisp/org-id.el
Simple merge

diff --cc lisp/org-odt.el
Simple merge

diff --cc lisp/org.el
Simple merge