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

diff --cc configure.ac
Simple merge

diff --cc lib-src/emacsclient.c
Simple merge

diff --cc lisp/server.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
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/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xwidget.c
Simple merge