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

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

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/pdumper.c
Simple merge