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

diff --cc Makefile.in
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/net/browse-url.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/gtkutil.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge