Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mwheel.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/xdisp.c
Simple merge