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

diff --cc src/eval.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/xdisp.c
Simple merge