Don't use C-x SPC as it's used in Emacs 24.4 by default for rectangular selection
Merge remote-tracking branch 'upstream/master'