Merge remote-tracking branch 'origin/master' into feature/android

diff --cc configure.ac
Simple merge

diff --cc etc/DEBUG
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge