Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca