Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca