Synch with the emacs-25 branch; the changes will be merged to the trunk (soon?)