* ChangeLog.2: Merge from emacs-25.