Merge branch 'master' into feature/pkg

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

diff --cc lisp/minibuffer.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge