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

diff --cc configure.ac
Simple merge

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

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

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

diff --cc lisp/subr.el
Simple merge

diff --cc src/w32.c
Simple merge