Merge missing commit from emacs-25 branch