Backport commit c9a75a4 from Emacs master branch