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