Reindent up-sexp for all lisp modes, not just elisp
Merge remote-tracking branch 'origin/master'