[EMACS]package update
Merge branch 'master' into osx