Merge remote-tracking branch 'origin/master' into pdumper

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/charset.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/dbusbind.c
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/nsfns.m
Simple merge

diff --cc src/nsmenu.m
Simple merge

diff --cc src/nsterm.m
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32menu.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xsettings.c
Simple merge

diff --cc src/xterm.c
Simple merge