Merge remote-tracking branch 'emacs/master'

Merged emacs repository (configuration files) into this repository.