Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca