Pre-update
Merge branch 'master' of github.com:theldoria/.emacs.d
Pre-update