Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca