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

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge