Backport commit 0c856a2 from Emacs master branch