Merge from emacs-24; up to 2012-11-08T14:54:03Z!monnier@iro.umontreal.ca