Update emacs files again.
Merge from origin (again).
Merge branch 'mergefix'