Merge Emacs 25.3 fixes