Merge branch 'master' into feature/pgtk

diff --cc lisp/cus-edit.el
Simple merge

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

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

diff --cc lisp/server.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/xdisp.c
Simple merge