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

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

diff --cc etc/NEWS
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc lisp/shell.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/lisp.h
Simple merge