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

diff --cc lisp/files.el
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xdisp.c
Simple merge