Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca