Merge remote-tracking branch 'origin/master' into scratch/pkg

diff --cc .gitignore
index 4717611ab8c1907425fe7eeeea3b48bbfd8cb946,0a68121009da95a8aca79bf821287cee8cd1876a..ca89bc47f79709a8f974a1055d4a1844a3a3ad11
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -372,9 -372,9 +372,10 @@@ lib-src/seccomp-filter-exec.pf
  # GDB history
  .gdb_history
  _gdb_history
 +*.desktop
  
  # Files ignored in exec/.
+ exec/aclocal.m4
  exec/config.status
  exec/loader
  exec/test

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/process.c
Simple merge