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

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/xdisp.c
Simple merge