Merge branch 'emacsupgrade'