Merge from emacs-24; up to 2012-12-14T21:27:39Z!rgm@gnu.org