Backport commit 78d45b6 from Emacs master branch