Stuff from linux
Merge remote-tracking branch 'origin/master'
Emacs stuff