Merge branch 'maint'

diff --cc lisp/org-clock.el
index e90c1d6,fd95bc0..e5488e4
--- 1/lisp/org-clock.el
--- 2/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@@ -199,9 -199,12 +199,12 @@@ 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")))
  
- (defcustom org-clock-modeline-total 'auto
+ (define-obsolete-variable-alias 'org-clock-modeline-total
+   'org-clock-mode-line-total "24.3")
+ 
+ (defcustom org-clock-mode-line-total 'auto
    "Default setting for the time included for the mode line clock.
  This can be overruled locally using the CLOCK_MODELINE_TOTAL property.
  Allowed values are: