Merge from origin/emacs-27

1fe596d8 (origin/emacs-27) Fix another compilation problem in a bui...
1 job for master in 55 minutes and 39 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #4721
test-all

00:55:39