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

diff --cc configure.ac
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/mwheel.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/keyboard.c
Simple merge