John, it's OK to install this change in the emacs-25 branch?