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/international/mule-cmds.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/url/url-privacy.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge