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/frame.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/xdisp.c
Simple merge