Merge remote-tracking branch 'origin/master' into scratch/pkg

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/xdisp.c
Simple merge