Don't use C-x SPC as it's used in Emacs 24.4 by default for rectangular selection
Merge branch 'master' into prelude-personal